Commit Graph
21419 Commits
Author SHA1 Message Date
Ghommie 0206a534b0 add in spaces. 2019-06-13 22:20:47 +02:00
Ghommie c37c432de6 port "PR to make travis use xenial and to make it work" 2019-06-13 22:18:13 +02:00
TrilbySpaseClone 1c45e2c615 Suggested 2019-06-13 16:02:48 -04:00
UserothandGitHub 3f4d9319e9 Update energy_net_nets.dm 2019-06-13 20:38:22 +02:00
UserothandGitHub e3acef755a Fuck you again, Travis. Do it right this time. 2019-06-13 20:33:45 +02:00
Useroth bab2ec4789 Travis, I fucking mean it. Compile it. 2019-06-13 15:46:12 +02:00
Useroth 5e90c530e0 Travis, you whore, compile it properly. 2019-06-13 15:37:18 +02:00
Useroth 591e5eb64d Merge branch 'ninja-shit' of github.com:Useroth/Citadel-Station-13 into ninja-shit 2019-06-13 15:28:26 +02:00
Useroth 2d977becb5 Finally fixed the net breaking mechanics. 2019-06-13 15:27:57 +02:00
UserothandUseroth 39bedb8341 Update ninjaDrainAct.dm 2019-06-13 15:27:56 +02:00
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
Useroth e33c57d8de Finally fixed the net breaking mechanics. 2019-06-13 15:19:12 +02:00
BlackMajor 9b01830987 Added fuel tank and welding goggles 2019-06-13 21:37:45 +12:00
Fermi 17403bd059 Non-functioning EMP code for review (revert before merging.) 2019-06-13 00:58:54 +01:00
Ghommie e2bf5b73fd I'm being too careless, sorry for the many commits. 2019-06-12 23:22:31 +02:00
Ghommie 7a8eaf41ac another get_cell() 2019-06-12 23:21:42 +02:00
Ghommie 5ba46eb517 Avoid runtiming. 2019-06-12 23:20:34 +02:00
Ghommie 2edef99b08 . 2019-06-12 23:16:27 +02:00
Ghommie a29095cbe1 Penitence for the awful mistakes I have done in the refactor. 2019-06-12 23:06:09 +02:00
Arturlang 44be4ea7b4 Reviewers suggestions 2019-06-12 23:58:54 +03:00
Ghommie 5a35e95735 . 2019-06-12 22:52:05 +02:00
Ghommie 4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
Ghommie 368267f53d dddddd 2019-06-12 20:31:24 +02:00
Ghommie 516b71ed7e fixing stunbatons. 2019-06-12 20:13:08 +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
BlackMajor 0f8b6f72f8 Get the fuck out step_x/y 2019-06-12 15:08:20 +12:00
BlackMajor b2c5430f6a Shit's done 2019-06-12 14:46:23 +12:00
TrilbyspacecloneandGitHub 207b12e47a Update custom_items.dm 2019-06-11 19:11:15 -04:00
TrilbySpaseClone 7f3e2dd28b Kimono
Adds blue Kimono for SFox63
2019-06-11 18:00:08 -04:00
CitadelStationBot d5bfe16c78 Automatic changelog generation for PR #8599 [ci skip] 2019-06-11 13:13:03 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 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
CitadelStationBot 5b90fa4d04 Automatic changelog generation for PR #8587 [ci skip] 2019-06-11 12:56:46 -05:00
kevinz000andGitHub 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 21cae7f0ed Fixed 2019-06-11 20:18:16 +03:00
unknown 80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
BlackMajor e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12: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
Poojawa 8087fcfac3 :thonk: 2019-06-10 21:08:54 -05:00