Commit Graph

431 Commits

Author SHA1 Message Date
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
kevinz000 c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
Ghom 0d37700836 Merge pull request #10926 from keronshb/PirateBombProof
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
r4d6 49f2993c59 Correct timer 2020-02-08 23:09:51 -05:00
r4d6 10490e1c15 3 minutes it is 2020-02-05 21:03:34 -05:00
r4d6 8430ee3684 Timer 2-5 minutes 2020-02-05 20:58:26 -05:00
keronshb 5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Seris02 6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Seris02 8f70bd304d yee 2020-02-04 13:24:30 +08:00
Seris02 659110ac8c yee again 2020-02-02 13:44:45 +08:00
Seris02 4c2e702d7a yee 2020-02-02 13:18:26 +08:00
Seris02 18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghom 44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
kevinz000 54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
Seris02 e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
kevinz000 f842a249a4 Update meteor_wave.dm 2020-01-25 22:11:49 -07:00
kevinz000 d7ba4134e1 Update meteor_wave.dm 2020-01-25 22:10:39 -07:00
kevinz000 8b4a050ad3 ok 2020-01-25 22:03:53 -07:00
Trilbyspaceclone 9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Seris02 74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02 a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
Seris02 04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
TrilbySpaceClone 92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Trilbyspaceclone f7aa4f3050 Merge branch 'master' into glassware 2020-01-06 23:55:44 -05:00
Ghommie 686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Trilbyspaceclone 2931cb6757 Merge branch 'master' into glassware 2020-01-02 20:30:20 -05:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Putnam 418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00
Putnam 90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Seris02 69d82338bc excludes certain ghost roles from being affected by health events 2019-12-28 16:46:50 +08:00
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
TrilbySpaceClone 67d3d19cb9 correctiosn
and movement
2019-12-07 13:43:34 -05:00
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Winter Flare 6377f1b3a9 Organisation 2019-12-06 03:42:57 -05:00
kevinz000 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
2019-12-05 21:54:42 -07:00
Sishen 3ccc88e2b9 Update meteor_wave.dm 2019-12-01 05:15:41 -07:00
Ghommie 4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie 5153ed04ec aaa 2019-11-21 06:48:26 +01:00
Putnam 0d297e92c7 read words 2019-11-19 22:02:06 -08:00
Putnam f7361c2059 Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. 2019-11-19 21:58:55 -08:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00