Skip to content

Commit

Permalink
Merge branch 'master' into royalmarines
Browse files Browse the repository at this point in the history
# Conflicts:
#	icons/mob/humans/onmob/ties.dmi
  • Loading branch information
spartanbobby committed Aug 6, 2023
2 parents eb0ac6a + 04c7967 commit 4c25524
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 67 deletions.
4 changes: 4 additions & 0 deletions code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,10 @@ var/list/roundstart_mod_verbs = list(
set desc = "Tells everyone about a random statistic in the round."
set category = "OOC"

var/prompt = tgui_alert(usr, "Are you sure you want to do this?", "Announce Random Fact", list("No", "Yes"))
if(prompt != "Yes")
return

message_admins("[key_name(usr)] announced a random fact.")
SSticker.mode?.declare_fun_facts()

Expand Down
6 changes: 0 additions & 6 deletions html/changelogs/AutoChangeLog-pr-3814.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-3845.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4009.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4037.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4087.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-4091.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4097.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4102.yml

This file was deleted.

33 changes: 33 additions & 0 deletions html/changelogs/archive/2023-08.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,36 @@
- ui: changed the almayer control console from html to tgui
- bugfix: custom faction messages will now be named properly in the paper printed
out from the almayer control console
2023-08-05:
BeagleGaming1:
- rscadd: Adds campfires, craftable with wood
- code_imp: Modifies brazier construction code for easier use and mapping
Morrow:
- bugfix: You can no longer bypass skill checks on pill bottles
Steelpoint:
- rscadd: A team of UPP survivors may spawn on Trijent Dam.
- mapadd: A new nightmare insert for Trijent Dam has been added, featuring a crashed
UPP dropship.
Vile Beggar:
- balance: Star Shells now have a higher minimum burn time and are more plentiful
in squad prep.
Zonespace27:
- bugfix: Underbarrel extinguishers can now be refilled.
ghostsheet:
- rscadd: Acid Runners will now respawn where it blew up, if there is no hivecore
to spawn at.
realforest2001:
- rscadd: Added an admin toggle flag for fitting mobs into disposals. (Within reason
- no queens...)
- rscadd: The Crawler trait that allows mobs to enter vents will also allow them
to climb into disposals regardless of above flag.
- rscadd: Added a subtype of disposal that can't fit mobs, used for the delivery
units.
smov:
- rscadd: Adds a new Marine Law charge
2023-08-06:
Ben10083:
- admin: You now need to give confirmation before announcing random facts (OOC tab
verb)
Steelpoint:
- bugfix: EMT/White-Green armband now has a sprite
Binary file removed scripts/ShuttleGenerator.rar
Binary file not shown.
31 changes: 0 additions & 31 deletions scripts/ircbot_message.py

This file was deleted.

0 comments on commit 4c25524

Please sign in to comment.