39527ae4a7
prevented hijack/martyr from being contractors
2020-03-06 17:21:41 -08:00
1c37b95c0b
renamed "gimmick" to "freeform"
2020-03-06 17:21:30 -08:00
71ac07426a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
2020-03-06 17:03:24 -08:00
182e98192c
no longer uses that var
2020-03-06 17:01:43 -08:00
7bed0d5c87
Of runtimes and null.
2020-03-07 01:57:15 +01:00
930643b01a
Blob Reroll
...
Also ports blob reroll
2020-03-06 19:06:50 -05:00
137e3560c5
Me 2048
2020-03-07 00:57:25 +01:00
9066287037
Oh yea I forgot tg repathed many /under clothes a while ago.
2020-03-07 00:42:18 +01:00
436e781ec9
Removed assassin-only, made subterfuge more likely to assassinate
2020-03-06 15:37:59 -08:00
e3e15ea7a4
accidental revert.
2020-03-07 00:30:10 +01:00
a817bd6115
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
f4e3d75088
Blob Reroll
...
Part of blob reroll
2020-03-06 17:37:07 -05:00
3e5809ae30
Update code/modules/food_and_drinks/food/snacks_frozen.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-06 16:32:11 -05:00
228012c718
Blob refactor ( #43872 )
...
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
bc981bd637
Update hivelord.dm
2020-03-06 21:55:43 +01:00
079fd425e5
Makes the monkeys' gorillize chances from radiation exponential.
2020-03-06 19:05:45 +01:00
a669e87db1
Merge branch 'master' into gc_debugging
2020-03-06 10:14:19 -07:00
93d995eb18
k
2020-03-06 10:13:11 -07:00
1cc7d01a44
Culls irrelevant targeting information.
2020-03-06 11:39:27 -05:00
4857bd120c
Fixes bartender drink slide spill
...
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
2020-03-06 10:06:59 -05:00
c6c676ceb5
Merge pull request #11298 from Kraseo/contracties
...
Ports TG's Syndicate Contractors
2020-03-06 15:23:30 +01:00
f1116648a8
corrects snowcones
2020-03-06 09:08:05 -05:00
a298a34ae9
Oh yea.
2020-03-06 14:57:34 +01:00
5d6eb6f24b
Patches some awful integrated circuit examiner runtime errors.
2020-03-06 14:56:49 +01:00
597e1210f3
fix quintuple sec mix_sound def
...
Fixes mix_sound for Quintuple Sec being assigned to mix_message. The fact that this was never reported before proves how infrequently people actually make quintuple sec.
2020-03-06 08:38:33 -05:00
5aacdded63
Update gloves.dm
2020-03-06 06:23:56 -07:00
2f83492451
Update ninjaDrainAct.dm
2020-03-06 06:23:13 -07:00
4b3725bb43
Merge pull request #11348 from Citadel-Station-13/kevinz000-patch-19
...
fixes pool mist garbage collection
2020-03-06 14:20:58 +01:00
f24c7fb142
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
...
Ashwalkers now can make a well, got their livestock back and more!
2020-03-06 13:48:03 +01:00
0ace3f2310
Update buffing.dm
2020-03-06 05:42:28 -07:00
178de5ee0d
Merge branch 'master' into more_crates+bags
2020-03-06 06:31:54 -05:00
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
4a108d7a9a
fixes oopsie
2020-03-06 04:40:22 -05:00
86baaf3710
Pixel shifting for ERP
2020-03-06 04:31:46 -05:00
3af4862be6
Update pool_controller.dm
2020-03-06 02:09:39 -07:00
62d2acf94f
Update slime.dm
2020-03-06 02:06:42 -07:00
87c869a735
Update carbon.dm
2020-03-06 02:00:19 -07:00
6db3a23828
Update belly_obj.dm
2020-03-06 01:44:45 -07:00
4d9c92c317
Update mob.dm
2020-03-06 01:39:16 -07:00
ae97cec8b4
Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1
...
The lavaland elite tumor shard revival now fetches the mob's ghost.
2020-03-06 00:20:18 -07:00
d376b99af6
Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2
...
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
2020-03-06 00:19:51 -07:00
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
23fa750e31
Merge pull request #11324 from Trilbyspaceclone/patch-302
...
Makes medical hardsuits have built in huds
2020-03-06 00:17:09 -07:00
78b1dcaae4
Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4
...
Allows blobbernauts to drag objects (but not mobs) again.
2020-03-06 00:14:43 -07:00
9420424c8f
Merge pull request #11332 from Ghommie/Ghommie-cit603
...
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
e08669e8a1
Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts
2020-03-06 00:15:37 -05:00
5c67c71e90
Update towercap.dm
2020-03-06 05:41:49 +01:00
b80acdfaa6
Update glass.dm
2020-03-06 05:39:18 +01:00
ee65f070bf
fixes runtime with body markings
2020-03-05 23:22:56 -05:00
0c4af362bc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605
2020-03-06 04:00:36 +01:00
Putnam