Commit Graph

19085 Commits

Author SHA1 Message Date
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
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
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
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
6ac964b35a e 2021-05-06 01:52:35 -07:00
SandPoot
6414b371f8 fancy description for the proc 2021-05-06 03:03:46 -03:00
SandPoot
6bd5707a63 found it 2021-05-06 02:50:32 -03:00
keronshb
7947258e51 Off balance disarm
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
Timothy Teakettle
a269e8bf03 migration fix 2021-05-06 01:51:17 +01:00
zerothebigboy
90930494d6 k 2021-05-05 18:43:11 -04:00
zerothebigboy
c8ebe720ec k 2021-05-05 18:25:05 -04:00
Timothy Teakettle
bee9d9c047 support for the ridiculous thing i just did 2021-05-05 22:29:21 +01:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Timothy Teakettle
d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Artur
e5646404d7 Fixes virus bottles being white 2021-05-05 21:34:53 +03:00
Timothy Teakettle
ea071bd031 comment 2021-05-05 18:28:55 +01:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00