164201ab27
Merge pull request #12956 from Arturlang/bloodsucker_death_lessspam
...
Makes bloodsucker death not spam now actually working
2020-08-05 15:15:30 -07:00
add9d5d0a0
Merge pull request #12889 from timothyteakettle/quirks-are-dumb
...
minor quirk changes
2020-08-05 15:13:52 -07:00
b2052a16cb
Merge pull request #13008 from zeroisthebiggay/powercreepislife
...
nukies can buy holoparasites not including support ones
2020-08-05 15:13:13 -07:00
f3e0255f7f
Merge pull request #13009 from Ludox235/ai-screams
...
Total law changes: 110
2020-08-05 15:12:53 -07:00
9b14dff46b
Merge pull request #13025 from Trilbyspaceclone/tea
...
Tea Party
2020-08-05 15:07:55 -07:00
4429c4615b
no gibbies please
2020-08-05 22:58:15 +01:00
6ba359e0a1
fix
2020-08-05 17:43:54 +01:00
14bc60955f
unlocked
2020-08-05 16:31:27 +01:00
92be50c252
blorbl
2020-08-05 09:28:34 -06:00
f2c1b25119
yes
2020-08-05 15:50:25 +01:00
1f62a4bbf9
typo
2020-08-05 15:29:07 +01:00
8effb219e1
fix a bug and reduce it by 1 more line
2020-08-05 15:27:48 +01:00
5297700340
snowflake coders are bad
2020-08-05 14:11:40 +01:00
f2f6416105
fixes - radio, broken - crewmanifest, gastank controler
2020-08-05 20:34:09 +08:00
61ed83027d
asj
2020-08-05 18:40:33 +10:00
810962c633
Update blood.dm
2020-08-05 01:29:51 -07:00
c0ac492d07
ok
2020-08-04 21:01:06 -07:00
06f3eb5e80
wacky ass
2020-08-04 22:58:51 -05:00
d79cc5f85d
oof
2020-08-04 20:57:37 -07:00
0a137d2584
whew
2020-08-04 20:52:35 -07:00
ed67801590
what if the tgui actualy recives it's topic?
2020-08-05 09:21:19 +08:00
1b367994b1
a
2020-08-04 20:48:17 -04:00
ff5efc7660
a
2020-08-04 20:48:08 -04:00
a3b3e23bac
fix ricochets
2020-08-04 23:41:55 +01:00
831ea372f8
buncha stuff
...
adds a check if the sigil is already busy which I forgot before, makes the brass claw wounds-2 compartible and changes some misc stuff
2020-08-04 17:33:57 +02:00
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
276d35a693
moves a check a few lines
...
tin
2020-08-04 16:59:02 +02:00
5d5459a318
Merge branch 'tea' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into tea
2020-08-04 10:07:10 -04:00
f2e4b7eacc
grammer
2020-08-04 10:07:04 -04:00
4ea05ab07e
Update drink_reagents.dm
2020-08-04 09:33:05 -04:00
0f29235e6a
Tea Party
2020-08-04 09:15:44 -04:00
3b34c75b37
a
2020-08-04 07:25:30 -04:00
b44a329db1
a
2020-08-04 07:25:18 -04:00
ef53f3faea
the old system isnt needed really but sure i guess
2020-08-04 11:43:15 +01:00
25d2b1a3f1
a
2020-08-04 05:53:36 -04:00
97438eb9b8
a
2020-08-04 05:53:28 -04:00
07c02e1c99
Commit message. Fixes slab
2020-08-04 16:26:30 +08:00
bbcc36bdec
ok
2020-08-03 22:31:31 -07:00
4df9efb076
heho attack text
2020-08-04 00:29:30 -05:00
7c7d635193
what if atmos relief works? and all the other ui's gets updated
2020-08-04 12:54:55 +08:00
25ab96cf53
funny revolver reskins
2020-08-03 20:39:06 -05:00
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
91664f5064
bracket
2020-08-03 22:17:35 +01:00
160991c5b4
Caps claw damage
...
The claw can now only have a maximum of bonus 18 damage caused by combo (after 10 consecutive hits against the same target), making it 33 damage total. The target shouldn't be standing by then anyways if they attacked them consecutively, but if they still are, better to have this capped.
2020-08-03 23:15:14 +02:00
5f8ed3ee3a
acidproof
2020-08-03 22:14:42 +01:00
3a0b34fb1b
funny aim go brr
2020-08-03 21:58:58 +01:00
8a3e69d32f
no more inaccuracy
2020-08-03 21:40:10 +01:00
a2155f9e91
more codersprite
...
clockie arm implants now have a somewhat different looking sprite (totally not just a normal arm implant recolor)
2020-08-03 22:13:50 +02:00
db8abc006a
Merge pull request #13010 from Seris02/fixeslizards
...
lizards no longer break their spines ~~roundstart~~ EVER AGAIN I FUCKING FIXED THE DOUBLE SET_SPECIES LIZARD BUG
2020-08-03 12:54:00 -07:00
silicons