shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,798 Commits 5 Branches 0 Tags
aa19c2a17b3fbddd4b6d03e7976f2e5e486da884
Commit Graph

11938 Commits

Author SHA1 Message Date
kevinz000 aa19c2a17b Merge pull request #10603 from Ghommie/Ghommie-cit510 
clockwork cuirass now compatible with snakes. The original author was too lazy.
 2020-01-23 04:47:18 -07:00
kevinz000 1b7265d8c1 Merge pull request #10605 from r4d6/Layer 
Port TG Layers updates and Freezer update
 2020-01-23 04:46:52 -07:00
kevinz000 88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 
Trilby's solar panels PR but improved.
 2020-01-23 04:35:13 -07:00
kevinz000 a01d7260d8 Merge pull request #10641 from jakeramsay007/Calibers-101 
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
 2020-01-23 04:34:24 -07:00
TrilbySpaceClone 86ea13afeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270 2020-01-22 23:00:54 -05:00
Ghom bf62563507 Merge pull request #10410 from CameronWoof/free-the-lizard 
Humans and anthromorphs can now use lizard tails.
 2020-01-23 03:06:52 +01:00
Ghom 3ce27d6c36 Merge pull request #10638 from Hatterhat/patch-3 
compact defibs have a properly set departmental flag now
 2020-01-23 02:51:17 +01:00
Ghom 04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8 
(is this really a good idea) hitscan emitters
 2020-01-23 02:44:17 +01:00
Ghom fcbc5149c4 Merge pull request #10606 from r4d6/patch-2 
Update the Passive Vents that I added
 2020-01-23 02:40:54 +01:00
r4d6 c78944c5bc Update 2020-01-22 13:47:57 -05:00
Trilbyspaceclone ebb6ac1d7b more words 2020-01-22 11:33:39 -05:00
Trilbyspaceclone bc1500c04c Update cleanbot.dm 2020-01-21 18:33:04 -05:00
Chayse Ramsay 5e5d80238b Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa. 
Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.
 2020-01-21 22:29:15 +00:00
kevinz000 ed5172f9ca changes 2020-01-20 23:17:58 -07:00
kevinz000 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
Ghom 8e49c99ca0 Merge pull request #10619 from Seris02/conveyor 
conveyor updates
 2020-01-21 03:37:42 +01:00
Ghom 3c53619f2a Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15 
Renames created volume in pyrotechnics to multiplier to alleviate confusion
 2020-01-21 03:05:22 +01:00
Ghom 7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting 
ghosting no longer makes it so you don't count for abductors
 2020-01-21 02:26:25 +01:00
kevinz000 efe3ebdb53 bet 2020-01-20 17:50:07 -07:00
Hatterhat fae0d6fe3f remember when i hoped i didnt forget something 2020-01-20 18:06:07 -06:00
Ghommie ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01:00
Hatterhat 348fa8be86 salt pr @kevinz000 2020-01-20 17:27:51 -06:00
Ghom 28a6e6eccf Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this 
.357 AP printable from illegal ballistics
 2020-01-20 18:50:25 +01:00
Seris02 ab771d9505 I deleted an important thing 2020-01-20 15:48:55 +08:00
kevinz000 593e626233 Merge pull request #10346 from deathride58/limbstamlossnerf 
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
 2020-01-19 23:11:02 -07:00
Hatterhat 28a2cc4a3d .357 AP printable from illegal ballistics 2020-01-19 23:55:12 -06:00
Seris02 afd848e45a weh 2020-01-20 10:29:09 +08:00
Ghom 77911f9009 Merge pull request #10597 from Putnam3145/player-panel-can-reenter 
Ghost role eligibility activation in player panel
 2020-01-20 03:24:46 +01:00
Ghom 8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option 
Made suicide a config flag
 2020-01-20 03:24:00 +01:00
Putnam3145 56e58e5c5e whoops 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-19 18:14:33 -08:00
Putnam 16f9c1bf78 feedback, EORG allowed 2020-01-19 18:01:21 -08:00
kevinz000 65eaf9787a Merge pull request #10097 from Ghommie/Ghommie-cit444 
Made traitor kevlar/armor padding accessories examine-proof.
 2020-01-19 16:58:27 -07:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-01-19 16:10:56 -07:00
kevinz000 0b0a6429ea Update pyrotechnics.dm 2020-01-19 13:31:11 -07:00
Ghom cf9c3a65fd Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans 
Adds bloodsucker antagonist bans
 2020-01-19 16:38:45 +01:00
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920 
you like examining things? - port of tgstation 40920
 2020-01-19 16:37:40 +01:00
Ghom 812182230f Merge pull request #10307 from Seris02/stunglasses 
stunglasses
 2020-01-19 16:35:47 +01:00
Ghom 4a0c85e0c0 Merge pull request #10594 from chefferz/chefferz-abductor1 
Removes shrink rays from abductor console.
 2020-01-19 16:12:51 +01:00
Putnam 1bdb515592 made suicide a config flag 2020-01-19 03:44:45 -08:00
Seris02 25d7af31a5 merge fixes 2020-01-19 16:36:04 +08:00
Hatterhat 590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
r4d6 2b3f00ed1e Fix Freezer overlay bug 2020-01-18 22:16:43 -05:00
Ghom 0a5e2cf8ff Merge pull request #10601 from Putnam3145/dojo-hilbert 
Adds 16777216 dorms to the ghost dojo
 2020-01-19 03:02:32 +01:00
r4d6 1eec1b11dd Update passive_vent.dm 2020-01-18 20:00:07 -05:00
r4d6 ae5e87d492 Apparently TG has more code than us 2020-01-18 19:12:00 -05:00
r4d6 5084146400 Port 2020-01-18 18:46:22 -05:00
Ghommie 072eca6ec0 fixes and more PRs 2020-01-18 23:01:00 +01:00
Ghommie 3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghommie ca7bdf5f88 clockwork cuirass now compatible with snakes. The original author is very lazy. 2020-01-18 22:06:14 +01:00
r4d6 810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents 2020-01-18 16:03:49 -05:00