shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,219 Commits 5 Branches 0 Tags
fd286c325ee136e595ffd5dfbfdb229936d02bb7
Commit Graph

20218 Commits

Author SHA1 Message Date
keronshb fa067a481a Removes VOG sleep command again 
Undocumented change.
 2021-05-12 13:09:39 -04:00
silicons a60f801f69 e 2021-05-12 04:23:53 -07: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 cda492c6ba Removes the condition if they're knocked down 2021-05-09 20:10:38 -04:00
keronshb 82e4421cde Ports Break in hand from tg 
58526
 2021-05-09 20:01:30 -04:00
zerothebigboy 315e4fcdaa look at this dude 2021-05-09 19:28:07 -04:00
zerothebigboy deb65ad7c8 look at this dude 2021-05-09 19:26:38 -04:00
zerothebigboy d2dbd7572b cyborgs and runtime fixes 2021-05-09 19:09:58 -04:00
LetterN 2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
zerothebigboy b3c0044edc almost forgot the documentations 2021-05-09 06:21:12 -04:00
zerothebigboy 6d4283ca22 holy fuck hate katanas 2021-05-09 06:12:29 -04: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
silicons 557eddb7dc Merge pull request #14696 from Putnam3145/priority_announce_verb 
Adds make priority announcement admin verb
 2021-05-07 18:41:48 -06:00
silicons 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
silicons 44fdbaadcb Merge pull request #14684 from zeroisthebiggay/pirates 
Pirate Update: Milk Is Not A Medical Substitute
 2021-05-07 18:40:41 -06:00
silicons e8b7abcfc6 Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin 
The Unrolling Pin! (Ready)
 2021-05-07 18:40:33 -06:00
Timothy Teakettle 149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle 5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle 5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle 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
Lin 54e12f2478 Merge pull request #14690 from silicons/firefighting_foam 
some changes to firefighting foam, fixes vscode launch bat
 2021-05-07 13:51:05 -05:00