Commit Graph

258 Commits

Author SHA1 Message Date
Lin 7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
2020-04-22 20:33:12 +00:00
Ghommie 824904844c Componentized for sanity. 2020-04-21 19:51:44 +02:00
Trilbyspaceclone 047bb6c162 Update hardsuit.dm 2020-04-20 16:19:30 -04:00
Ghommie e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
Lin 79f41bc654 Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
2020-04-14 18:37:31 +00:00
Ghommie db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghom 5765ceb316 Update hardsuit.dm 2020-04-13 15:02:01 +02:00
Ghom 873e67f79c Update hardsuit.dm 2020-04-13 14:57:47 +02:00
kevinz000 105d405d2d Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
2020-04-12 22:34:45 -07:00
Ghommie 0d0f14d3f8 Item color removal port fixes. 2020-04-13 03:34:58 +02:00
kevinz000 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Lin 8379169b81 Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
kevinz000 413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
2020-04-03 16:31:10 -07:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie 54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
kevinz000 7a25e04324 bet 2020-03-16 11:15:11 -07:00
kevinz000 d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000 e3301f8722 bet 2020-03-16 10:44:02 -07:00
kevinz000 6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000 a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
Ghommie ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Putnam3145 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
Ghommie d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghommie 2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
kevinz000 e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000 d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
kevinz000 bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
kevinz000 aca1d70bbb Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy
syndicate contractor helmets are no longer secretly lead
2020-03-10 05:56:08 -07:00
kevinz000 bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614
Porting more legcuffs / bola fixes etcetera
2020-03-09 21:01:51 -07:00
Ghommie 4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
ZeroMan c079dba753 its a fucking helmet 2020-03-08 23:07:24 -04:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
ZeroMan 388891bde3 fianlly ive discovered obanium 2020-03-08 18:31:12 -04:00
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
ZeroMan a431bdb0de okay here we go 2020-03-07 23:20:01 -05: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 23fa750e31 Merge pull request #11324 from Trilbyspaceclone/patch-302
Makes medical hardsuits have built in huds
2020-03-06 00:17:09 -07:00
Trilbyspaceclone 1c310f6cee Update hardsuit.dm 2020-03-04 13:01:25 -05:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Kraseo 4315a4d1b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 23:06:29 +01:00
Kraseo e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
ancientpower 56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Kraseo d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
ancientpower 12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Artur c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00