Commit Graph

21280 Commits

Author SHA1 Message Date
Ghom
137e3560c5 Me 2048 2020-03-07 00:57:25 +01:00
Ghom
9066287037 Oh yea I forgot tg repathed many /under clothes a while ago. 2020-03-07 00:42:18 +01:00
Putnam
436e781ec9 Removed assassin-only, made subterfuge more likely to assassinate 2020-03-06 15:37:59 -08:00
Ghommie
e3e15ea7a4 accidental revert. 2020-03-07 00:30:10 +01:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
keronshb
f4e3d75088 Blob Reroll
Part of blob reroll
2020-03-06 17:37:07 -05:00
Trilbyspaceclone
c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -05:00
Trilbyspaceclone
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
keronshb
228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
Ghom
bc981bd637 Update hivelord.dm 2020-03-06 21:55:43 +01:00
Ghommie
079fd425e5 Makes the monkeys' gorillize chances from radiation exponential. 2020-03-06 19:05:45 +01:00
kevinz000
a669e87db1 Merge branch 'master' into gc_debugging 2020-03-06 10:14:19 -07:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
Ragolution
1cc7d01a44 Culls irrelevant targeting information. 2020-03-06 11:39:27 -05:00
Ragolution
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
Ghom
c6c676ceb5 Merge pull request #11298 from Kraseo/contracties
Ports TG's Syndicate Contractors
2020-03-06 15:23:30 +01:00
kevinz000
c2822dd885 Update stunbaton.dm 2020-03-06 07:23:29 -07:00
kevinz000
0afaf6794c Update stunbaton.dm 2020-03-06 07:21:52 -07:00
Ghom
75aa5ebc95 Merge pull request #11334 from Putnam3145/power-sink-suck
Made power sink objective more feasible
2020-03-06 15:09:43 +01:00
TrilbySpaceClone
f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05:00
Ghommie
a298a34ae9 Oh yea. 2020-03-06 14:57:34 +01:00
Ghommie
5d6eb6f24b Patches some awful integrated circuit examiner runtime errors. 2020-03-06 14:56:49 +01:00
Ragolution
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
kevinz000
5aacdded63 Update gloves.dm 2020-03-06 06:23:56 -07:00
kevinz000
2f83492451 Update ninjaDrainAct.dm 2020-03-06 06:23:13 -07:00
Ghom
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
Ghom
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
kevinz000
0ace3f2310 Update buffing.dm 2020-03-06 05:42:28 -07:00
Kraseo
87773343c1 marks area/ruin/space as outdoors so it's not a valid dropoff location 2020-03-06 12:08:32 +01:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
monster860
4a108d7a9a fixes oopsie 2020-03-06 04:40:22 -05:00
monster860
86baaf3710 Pixel shifting for ERP 2020-03-06 04:31:46 -05:00
kevinz000
3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -07:00
kevinz000
62d2acf94f Update slime.dm 2020-03-06 02:06:42 -07:00
kevinz000
87c869a735 Update carbon.dm 2020-03-06 02:00:19 -07:00
kevinz000
c752661399 Update datumvars.dm 2020-03-06 01:51:20 -07:00
kevinz000
6db3a23828 Update belly_obj.dm 2020-03-06 01:44:45 -07:00
kevinz000
4d9c92c317 Update mob.dm 2020-03-06 01:39:16 -07:00
kevinz000
0a68143a3e Merge pull request #11297 from Ghommie/Ghommie-cit597
some dozens lines about some update_overlays issues and cryopods/MMIs.
2020-03-06 00:20:54 -07:00
kevinz000
29727b2fc9 Merge pull request #11306 from Ghommie/Ghommie-cit598
Removes makeshift switchblades
2020-03-06 00:20:36 -07:00
kevinz000
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
kevinz000
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
kevinz000
5ebf8ef1e3 Merge pull request #11316 from Citadel-Station-13/Ghommie-patch-3
Makes cargo passive point generation 125 a minute and not 2 or so every tick.
2020-03-06 00:19:26 -07:00
kevinz000
f1d9725bd8 Merge pull request #11319 from Ghommie/Ghommie-cit599
Fixes and improves RCL sprite update procs.
2020-03-06 00:17:53 -07:00
kevinz000
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
kevinz000
23fa750e31 Merge pull request #11324 from Trilbyspaceclone/patch-302
Makes medical hardsuits have built in huds
2020-03-06 00:17:09 -07:00
kevinz000
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
kevinz000
dac74ccf2d Merge pull request #11331 from Ghommie/Ghommie-cit602
Fixing one hell of a gibs runtime.
2020-03-06 00:14:28 -07:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
deathride58
e08669e8a1 Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts 2020-03-06 00:15:37 -05:00