Commit Graph

8304 Commits

Author SHA1 Message Date
Useroth ee661d1eb8 An afterthought regarding healing/reviving the capturees. 2019-06-13 15:27:56 +02:00
Useroth 35fe334fe8 Small tweak. 2019-06-13 15:27:56 +02:00
Useroth 231da023ec Makes the gloves actually stun people. 2019-06-13 15:27:55 +02:00
Useroth df15e53cd3 Another attempt at the nets not being breakable with bare hands. Now with more consideration. 2019-06-13 15:27:55 +02:00
Useroth 2e5ad2f4d8 Might as well crank it up a little more. 2019-06-13 15:27:55 +02:00
Useroth 7fd2c60992 Makes energy nets a bit sturdier and unbreakable with bare hands. 2019-06-13 15:27:54 +02:00
Useroth 04a1c7ada4 Energy net and capture objective tweak. 2019-06-13 15:27:54 +02:00
Useroth f9c249b644 Energy net tweak to make it less clunky to use. 2019-06-13 15:27:54 +02:00
Arturlang 44be4ea7b4 Reviewers suggestions 2019-06-12 23:58:54 +03:00
Ghommie 4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
BlackMajor 142d62908f Actually make it 15, the pie starts with 13u already used 2019-06-12 21:18:56 +12:00
BlackMajor 7b79bbcb29 Changes transfer amount to 10u instead of the full 80 2019-06-12 21:17:31 +12:00
BlackMajor 90e572ec03 Honk 2019-06-12 20:03:17 +12:00
kevinz000 54b3568319 Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
2019-06-11 11:13:01 -07:00
kevinz000 d2b40ea73d Merge pull request #8610 from Sishen1542/fingerlessinsuls
Changes assistant family heirloom to a pair of fingerless insulated gloves
2019-06-11 11:03:56 -07:00
kevinz000 6ead9bbe65 Merge pull request #8587 from SkullyRoberts/DickImplant
Added a single use penis autosurgeon as rare maint loot. Because why the hell not?
2019-06-11 10:56:44 -07:00
unknown 80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
unknown 355e384ba1 Spacing fixes 2019-06-11 14:31:27 +03:00
unknown 9219401154 Doneso 2019-06-11 14:24:16 +03:00
TrilbySpaseClone 3cebb1e807 Worked?
Yay?
2019-06-10 22:59:36 -04:00
Ghommie a7bbfe46ac Fix chem dispensers starting with an extra power cell 2019-06-10 14:55:17 +02:00
BlackMajor 7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
Poojawa d8dbad6e2e Digitigrade socks 2019-06-10 04:47:07 -05:00
Sishen 9f80fbe68b Coloring gloves? Not on my watch! 2019-06-10 05:20:54 -04:00
Sishen 4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
Poojawa 17629d4feb client check I guess 2019-06-10 03:28:56 -05:00
kevinz000 49b61b54db yeah no stamina buffer I GUESS 2019-06-10 00:18:41 -07:00
kevinz000 8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
Trilbyspaceclone 0d7b769eee Merge branch 'master' into meteor 2019-06-09 17:01:06 -04:00
Trilbyspaceclone 7c59349ad3 Update medical.dm 2019-06-09 12:02:16 -04:00
Poojawa 3f1b7e4dd6 Pacifists can nom things now, but not feed to others 2019-06-09 02:23:53 -05:00
kevinz000 b534f57374 Update human.dm 2019-06-08 23:44:27 -07:00
Poojawa cac80ec8c8 Update laborstacker.dm 2019-06-09 01:43:39 -05:00
kevinz000 1cf5e24b4d Update human.dm 2019-06-08 23:23:21 -07:00
Ghommie cb255b8719 give'r or leave'r, buddy. 2019-06-09 06:54:26 +02:00
Ghommie c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
kevinz000 88240ca06c Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 19:45:19 -07:00
kevinz000 ec9ae5348f Merge remote-tracking branch 'origin/master' into kevinz000-patch-48 2019-06-08 19:10:59 -07:00
kevinz000 752a5835df Merge remote-tracking branch 'origin/master' into changeling_adrenaline 2019-06-08 18:31:37 -07:00
kevinz000 3b9188d301 let's see how badly this goes 2019-06-08 18:28:04 -07:00
kevinz000 c3db9a3cd9 stuff 2019-06-08 18:22:37 -07:00
Ghommie 7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
kevinz000 1a07f304c9 Update examine.dm 2019-06-08 17:32:36 -07:00
kevinz000 5cf0a9e67f Update carbon_defense.dm 2019-06-08 17:30:50 -07:00
Thalpy 628482e53b Merge branch 'master' into FriendlyEmpathy 2019-06-08 23:45:37 +01:00
SkullyRoberts 30b8d8db1a Made the nudity permit cover genitals and boobs 2019-06-08 18:38:28 -04:00
SkullyRoberts e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
Trilbyspaceclone b073c29b19 Update all_nodes.dm 2019-06-08 16:17:49 -04:00
Trilbyspaceclone 3b941210e5 Update medical_designs.dm 2019-06-08 16:16:17 -04:00
kevinz000 2cda2380f6 durasteel toolboxes 2019-06-08 03:50:22 -07:00