Commit Graph

7772 Commits

Author SHA1 Message Date
Useroth a92abcbb96 It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with. 2019-05-18 21:40:43 +02:00
Useroth d2f7b961d9 Touch-up 2019-05-17 17:16:43 +02:00
Useroth 0f54bf7471 Might as well format it a little more. 2019-05-17 17:09:10 +02:00
Useroth 73c3e94946 A fixed oopsie. 2019-05-17 17:07:45 +02:00
Useroth 4d75eca582 Well, that was surely an interesting thing to code. 2019-05-17 16:22:17 +02:00
Useroth 06681790cd ... 2019-05-17 04:24:38 +02:00
kevinz000 a3114d830a Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
2019-05-14 13:48:54 -07:00
deathride58 06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
BurgerLua 34cb661211 Requested changes 2019-05-12 13:44:23 -07:00
kevinz000 9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
Better Locked Collar checks
2019-05-11 22:21:16 -07:00
kevinz000 4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes
Adds EMP Defensive Traps to Clockcult
2019-05-11 22:19:46 -07:00
kevinz000 db99b595f3 Merge pull request #8331 from Useroth/dick-circuits
Dildo-shaped circuit assemblies. Because that's what the community needs.
2019-05-11 22:17:46 -07:00
kevinz000 36ee078e23 Merge pull request #8333 from Useroth/ayy-baton
Abductor baton buff. Because it currently sucks balls.
2019-05-11 22:17:27 -07:00
kevinz000 86e3992945 Merge pull request #8335 from Poojawa/quick-fiiiix-marking
Quick fiiiix marking
2019-05-11 22:16:37 -07:00
kevinz000 9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
2019-05-11 22:14:15 -07:00
kevinz000 4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden
Golden toolboxes.
2019-05-11 22:13:18 -07:00
BurgerLua f66326ab51 Fixes an potential AI exploit. 2019-05-10 19:19:42 -07:00
BurgerLua 4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua d97bf47b95 Added 2019-05-10 18:12:36 -07:00
Trilbyspaceclone 86e5d96679 Update uplink_items.dm 2019-05-10 14:55:46 -04:00
Trilbyspaceclone 651a452ed0 Update recipes.dm 2019-05-10 14:50:44 -04:00
Sishen c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
BurgerLua 6df27ef2a3 Updated integrated circuits 2019-05-09 15:25:48 -07:00
Poojawa 28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
Useroth 83661fff9d Update abduction_gear.dm 2019-05-09 13:17:12 +02:00
Useroth 07685a1074 Abductor baton buff. Because it currently sucks balls. 2019-05-09 12:20:02 +02:00
Useroth b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. 2019-05-09 08:45:47 +02:00
kevinz000 a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
deathride58 2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
2019-05-07 02:19:40 -04:00
Trilbyspaceclone ae75bf2fd1 Update autolathe_designs.dm 2019-05-06 23:46:31 -04:00
deathride58 f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106
Buffs blob Shield armor, as well as weaken state
2019-05-06 22:13:50 -04:00
deathride58 5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45
vent_clog event now respects vent welding
2019-05-06 22:08:43 -04:00
deathride58 24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48
disables skewium due to severe code issues
2019-05-06 22:08:16 -04:00
deathride58 9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47
adds message monitor to telecomms technode
2019-05-06 22:04:12 -04:00
deathride58 0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
2019-05-06 21:58:44 -04:00
deathride58 aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
deathride58 bb9c479566 Merge pull request #8313 from BurgerLUA/SlurringFix
Fixes a few Slurring bugs
2019-05-06 21:00:33 -04:00
Trilbyspaceclone 9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -04:00
Trilbyspaceclone 5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00
Trilbyspaceclone 5904d1d281 Update power_designs.dm 2019-05-05 06:45:40 -04:00
kevinz000 383cae2949 Merge pull request #8317 from deathride58/herewegoagain
[s] Clamps biogen amount to a sane amount
2019-05-04 23:18:36 -07:00
kevinz000 1b387eb5e3 Merge pull request #8314 from Poojawa/mawp
Mawp
2019-05-04 23:18:14 -07:00
kevinz000 1caa3ba720 Merge pull request #8315 from Trilbyspaceclone/patch-115
Maybe fixes laser carbine sprites
2019-05-04 23:17:51 -07:00
BurgerLua 1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
deathride58 7dd5e563b0 Clamps biogen amount to a sane amount 2019-05-02 00:21:38 -04:00
Trilbyspaceclone 29a4750e21 Update autolathe_designs.dm 2019-05-01 18:38:40 -04:00
Trilbyspaceclone 0aa78684a5 I guess cookies unlock collars are not intended 2019-05-01 18:36:54 -04:00
Trilbyspaceclone 831e450b3f Update weapon_designs.dm 2019-05-01 16:08:17 -04:00
Trilbyspaceclone 150db880de Update laser.dm 2019-05-01 16:07:11 -04:00