34869215e8
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-14 01:59:32 +01:00
d7f8136d5a
Merge pull request #14715 from keronshb/vogsleepgone
...
Removes Voice of God sleep again since an undocumented change readded it.
2021-05-13 17:50:14 -05:00
040bcb155a
Update uplink_stealth.dm
2021-05-13 05:03:09 -04:00
6e3e075ff9
Oops forgot something
2021-05-12 13:14:54 -04:00
fa067a481a
Removes VOG sleep command again
...
Undocumented change.
2021-05-12 13:09:39 -04:00
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
625488891e
Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
...
Lavaland Wine: Pinot Mort (Ready)
2021-05-12 04:43:11 -06:00
2d455e4da2
Merge pull request #14710 from Linzolle/anthro
...
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
c5f13c44a8
Merge pull request #14708 from qweq12yt/misc-fixes
...
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -06:00
3b1d66efc5
Merge pull request #14702 from zeroisthebiggay/fineilldooitmyself
...
bunny ears but they're not lops (vegas style)
2021-05-12 04:42:12 -06:00
82b6443928
Merge pull request #14700 from keronshb/skewerpain
...
What if failing to remove a brass skewer caused *pain?
2021-05-11 14:11:07 -05:00
0a883f3796
Merge pull request #14706 from DeltaFire15/heretic-bladeshatter-bug
...
Fixes heretic bladeshatters, also fixes find_safe_turf since those were related
2021-05-11 14:08:34 -05:00
4609d732f9
more spellcheck of anthropomorph
2021-05-10 17:15:43 -05:00
59914250c3
spellcheck
2021-05-10 17:04:48 -05:00
7560898f94
Update preferences.dm
2021-05-10 22:53:27 +01:00
19d6ff8371
Merge pull request #14703 from LetterN/fixes-syndie-shit
...
balances syndie simplemob
2021-05-10 14:29:48 -05:00
cab026c137
Merge pull request #14705 from LetterN/fixes-roundend-runtime
...
fixes roundend runtime
2021-05-10 14:28:47 -05:00
176a0ccebe
Merge pull request #14704 from LetterN/buy-illegals
...
fixes-emag-on-console
2021-05-10 14:28:37 -05:00
3b234405c8
fixed disky comfort spam
2021-05-10 16:06:57 -03:00
8c0911e968
fix hulks breaking cuffs/zipties
2021-05-10 15:56:50 -03:00
60673d9c5c
AAAAAA
2021-05-10 17:13:24 +01:00
0c0e5f6d18
fixes
2021-05-10 17:44:21 +02:00
c51fa954cf
Update mobs.dm
2021-05-10 14:51:18 +01:00
be9b1ddffb
fixes
2021-05-10 14:43:45 +01:00
24774856bc
Update preferences.dm
2021-05-10 14:34:22 +01:00
cfcbaa001b
fixes
2021-05-10 14:31:36 +01:00
6926ea74ab
Update preferences.dm
2021-05-10 13:58:53 +01:00
c0a56eb766
Merge pull request #14695 from Putnam3145/supernova-end-notification
...
Supernovae now announce when over, + other supernova tweaks
2021-05-10 01:24:05 -05:00
6095b4724f
fixes fox markings legs
2021-05-10 01:54:24 +01:00
1bee003d49
fixes roundend runtime
2021-05-09 22:48:50 +08:00
57044515d2
fixes-emag-on-console
2021-05-09 21:39:26 +08:00
2bf221be4f
fixes syndie simplemob
2021-05-09 21:35:15 +08:00
181dcc347b
cum sex balls penis
2021-05-09 04:34:25 -04:00
1804b7ba63
Skewer Pain
...
Replaces ouchie with *pain
2021-05-08 19:35:55 -04:00
d479f80f9b
linters are literally stupid
2021-05-08 21:19:07 +01:00
23015f83c4
re-adds the newline
2021-05-08 21:04:27 +01:00
0bc90971ff
removes the newline
2021-05-08 21:04:01 +01:00
90fcc02ba9
Merge pull request #14674 from silicons/atmosstuffs
...
[ATMOS CHANGE TESTMERGE THIS OH GOD] adds multiz_accessible_levels infinite loop guard, reworks atmos adjacent turfs proc
2021-05-07 21:36:46 -07:00
022003dc7c
funny comment
2021-05-08 02:05:20 +01:00
42d8d83ca2
Update preferences_savefile.dm
2021-05-08 01:52:55 +01:00
4afb5209a1
Merge pull request #14637 from TheObserver-sys/DerringerPass1
...
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
557eddb7dc
Merge pull request #14696 from Putnam3145/priority_announce_verb
...
Adds make priority announcement admin verb
2021-05-07 18:41:48 -06:00
633591b81e
Merge pull request #14688 from SandPoot/good-tooltips
...
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
44fdbaadcb
Merge pull request #14684 from zeroisthebiggay/pirates
...
Pirate Update: Milk Is Not A Medical Substitute
2021-05-07 18:40:41 -06:00
e8b7abcfc6
Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin
...
The Unrolling Pin! (Ready)
2021-05-07 18:40:33 -06:00
149cdeb9fd
Update preferences_savefile.dm
2021-05-08 01:34:43 +01:00
5e271c239f
conflict resolving caused runtimes
2021-05-08 01:31:44 +01:00
5bc33c222a
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-08 01:28:23 +01:00
108ff3d2f4
Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two
2021-05-08 01:27:22 +01:00
d36e82c1c1
Merge pull request #14691 from silicons/radiationmaybe
...
so i fixed radiation not going away but it fixed the race condition that let radioactive things.. actually stack so let's make chernobyl a thing again yay :)
2021-05-07 13:51:10 -05:00
timothyteakettle