Commit Graph

20390 Commits

Author SHA1 Message Date
Putnam
ae94083dbe Added more explanation to hijack. 2020-03-12 14:59:04 -07:00
Putnam
5a18d143a9 Removed extraneous apply_innate_effects
This one was caused by the hear proc overhaul.
2020-03-09 18:47:42 -07:00
Putnam
f19647acc7 Fixed uplinks not being given to traitors.
Always remember to follow your code VERY CLOSELY or garbage like this happens. finalize_traitor calls traitor_kind.finalize_traitor(); that's how I intended it to happen. Instead, I foolishly wrote "traitor_kind.finalize_traitor()" in the on_gain() proc. I didn't notice for a LONG time, because... well, it's supposed to call finalize_traitor(), just not that one. The pitfalls of working with old code.
2020-03-09 18:47:06 -07:00
Putnam
eacdc3b438 Let gorlex marauders contract, and made them hijack 2x as fast as other traitors 2020-03-08 14:05:04 -07:00
Putnam
023d1d6d97 Tweaked weights a bunch 2020-03-06 21:40:44 -08:00
Putnam
f670d09a88 Made IAA work again (whoops) 2020-03-06 21:39:38 -08:00
Putnam
39527ae4a7 prevented hijack/martyr from being contractors 2020-03-06 17:21:41 -08:00
Putnam
1c37b95c0b renamed "gimmick" to "freeform" 2020-03-06 17:21:30 -08:00
Putnam
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
Putnam
182e98192c no longer uses that var 2020-03-06 17:01:43 -08:00
Putnam
436e781ec9 Removed assassin-only, made subterfuge more likely to assassinate 2020-03-06 15:37:59 -08:00
Trilbyspaceclone
c2e56f156f Update recipes_weapon_and_ammo.dm 2020-03-06 17:18:10 -05:00
Ghom
c6c676ceb5 Merge pull request #11298 from Kraseo/contracties
Ports TG's Syndicate Contractors
2020-03-06 15:23:30 +01: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
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
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
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
kevinz000
3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -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
Ghom
859cde2065 Update watercloset.dm 2020-03-06 05:43:31 +01:00
Ghom
5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
Ghom
b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
Ghom
44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
Putnam
fbb97ea9d4 Made power sink objective more feasible 2020-03-05 01:50:19 -08:00
kevinz000
5bca5690c4 ok 2020-03-05 01:00:35 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghommie
d4af57b0a9 Fixing one hell of a gibs runtime. 2020-03-05 01:02:54 +01:00
kevinz000
b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
Ghom
68273d0211 Merge pull request #11218 from Seris02/nomoreailipreading
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
2020-03-05 00:26:12 +01:00
Ghom
5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy
changes sausage girth from circumference -> diameter
2020-03-04 23:49:58 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
Ghom
9eedf8c1fb Update blob_mobs.dm 2020-03-04 23:34:59 +01:00
Ghom
ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix
Fixes reagent containers transfer cycling
2020-03-04 23:17:00 +01:00
Ghom
17488480b1 Allows blobbernauts to drag objects (but not mobs) again. 2020-03-04 22:43:30 +01:00
TrilbySpaceClone
7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05:00