shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

28420 Commits

Author SHA1 Message Date
DeltaFire
0c0e5f6d18 fixes 2021-05-10 17:44:21 +02:00
Timothy Teakettle
c51fa954cf Update mobs.dm 2021-05-10 14:51:18 +01: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
LetterN
1bee003d49 fixes roundend runtime 2021-05-09 22:48:50 +08:00
LetterN
57044515d2 fixes-emag-on-console 2021-05-09 21:39:26 +08: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
Timothy Teakettle
23015f83c4 re-adds the newline 2021-05-08 21:04:27 +01:00
Timothy Teakettle
0bc90971ff removes the newline 2021-05-08 21:04:01 +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
keronshb
11a7e118fe Puts off balance duration to 2 seconds 
Might be better at 2.
 2021-05-07 23:58:09 -04: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
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
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
timothyteakettle
bb893383bc Update _bodyparts.dm 2021-05-07 17:27:55 +01:00
timothyteakettle
0fb72497ff color fix 2021-05-07 16:46:40 +01:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
Lin
a40bc38c53 Merge pull request #14671 from timothyteakettle/humans-with-digi-legs 
lets humans have digi legs (and avian legs)
 2021-05-07 01:00:27 -05:00
Lin
470f417a6b Merge pull request #14687 from Arturlang/cum_blood_fixes 
Fixes virus bottles being white
 2021-05-07 00:54:53 -05:00
timothyteakettle
3b07164fb4 Update preferences_savefile.dm 2021-05-07 00:56:27 +01:00
timothyteakettle
f5e2d3de2c Update preferences_savefile.dm 2021-05-07 00:44:44 +01:00
timothyteakettle
eab47bb6ae Update preferences_savefile.dm 2021-05-07 00:43:33 +01:00
timothyteakettle
440a6633ea Update preferences_savefile.dm 2021-05-07 00:37:33 +01:00
timothyteakettle
e95e4ed106 Update preferences_savefile.dm 2021-05-06 23:39:41 +01:00
Putnam
6c8fa56132 Adds make priority announcement verb 2021-05-06 15:10:36 -07:00
Putnam
8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
timothyteakettle
b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle
80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle
cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
Putnam
ecca9d788b More supernova tweaks 2021-05-06 14:32:13 -07:00
silicons
cb1e2f3730 thing 2021-05-06 02:09:06 -07:00