Commit Graph

19022 Commits

Author SHA1 Message Date
Timothy Teakettle
80d287abca index magic moment 2021-05-16 03:10:35 +01:00
zeroisthebiggay
a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay
03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay
2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay
8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00
zeroisthebiggay
1ff27aa732 Update drinks_recipes.dm 2021-05-15 09:43:55 -04:00
zeroisthebiggay
90f9c3cb79 Update drinks_recipes.dm 2021-05-15 09:39:56 -04:00
zerothebigboy
37873d6750 gommit 2021-05-15 08:52:24 -04:00
silicons
4ffec1dafa Update gateway.dm (#14711) 2021-05-14 17:50:27 +02:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Lin
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
keronshb
ef470a3baf Fixes Void Robes for Digi legs 2021-05-13 13:37:35 -04:00
zeroisthebiggay
040bcb155a Update uplink_stealth.dm 2021-05-13 05:03:09 -04:00
keronshb
611dca2776 New Line at End of file 2021-05-12 17:04:10 -04:00
Putnam
1a92973d99 Antag/species quirk blacklist fix 2021-05-12 10:18:52 -07:00
keronshb
6e3e075ff9 Oops forgot something 2021-05-12 13:14:54 -04:00
keronshb
fa067a481a Removes VOG sleep command again
Undocumented change.
2021-05-12 13:09:39 -04:00
silicons
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
silicons
625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
Lavaland Wine: Pinot Mort (Ready)
2021-05-12 04:43:11 -06:00
silicons
2d455e4da2 Merge pull request #14710 from Linzolle/anthro
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
silicons
c5f13c44a8 Merge pull request #14708 from qweq12yt/misc-fixes
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -06:00
silicons
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
keronshb
79f5feea9f Merge remote-tracking branch 'upstream/master' into hereticadjustments 2021-05-11 17:58:41 -04:00
keronshb
4749be2ba8 Final rework
Last part.
2021-05-11 16:52:16 -04:00
Lin
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
Lin
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
keronshb
57dfe8dc09 New Reality when one disappears
Spawns in a new reality when one disappears.
2021-05-10 21:12:45 -04:00
Linzolle
4609d732f9 more spellcheck of anthropomorph 2021-05-10 17:15:43 -05:00
Lin
59914250c3 spellcheck 2021-05-10 17:04:48 -05:00
timothyteakettle
7560898f94 Update preferences.dm 2021-05-10 22:53:27 +01:00
Lin
19d6ff8371 Merge pull request #14703 from LetterN/fixes-syndie-shit
balances syndie simplemob
2021-05-10 14:29:48 -05:00
qweq12yt
3b234405c8 fixed disky comfort spam 2021-05-10 16:06:57 -03:00
qweq12yt
8c0911e968 fix hulks breaking cuffs/zipties 2021-05-10 15:56:50 -03:00
Timothy Teakettle
60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
DeltaFire
0c0e5f6d18 fixes 2021-05-10 17:44:21 +02:00
Timothy Teakettle
be9b1ddffb fixes 2021-05-10 14:43:45 +01:00
Timothy Teakettle
24774856bc Update preferences.dm 2021-05-10 14:34:22 +01:00
Timothy Teakettle
cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle
6926ea74ab Update preferences.dm 2021-05-10 13:58:53 +01:00
Lin
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
Timothy Teakettle
6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01:00
keronshb
82e4421cde Ports Break in hand from tg
58526
2021-05-09 20:01:30 -04:00
LetterN
2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
zerothebigboy
181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00
keronshb
1804b7ba63 Skewer Pain
Replaces ouchie with *pain
2021-05-08 19:35:55 -04:00
Timothy Teakettle
d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
Putnam3145
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
Timothy Teakettle
022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle
42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
silicons
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