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

18405 Commits

Author SHA1 Message Date
ShadeAware
fd04469ff0 H 2020-01-23 08:01:28 -05:00
ShadeAware
0b1a0e7286 Update weaponry.dm 2020-01-22 17:54:27 -05:00
ShadeAware
1c4f37b5bf MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG 
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
 2020-01-22 17:50:57 -05:00
ShadeAware
cc07ef42b7 Revert "Update hud.dm" 
This reverts commit e1fb7f3e64.
 2020-01-21 19:09:42 -05:00
ShadeAware
ff23bc396a Revert "Revert "Update hud.dm"" 
This reverts commit 4c9e240ecb.
 2020-01-21 19:04:40 -05:00
ShadeAware
4c9e240ecb Revert "Update hud.dm" 
This reverts commit e1fb7f3e64.
 2020-01-21 19:04:36 -05:00
ShadeAware
e1fb7f3e64 Update hud.dm 2020-01-21 18:49:37 -05:00
ShadeAware
08016a8461 Ghommie commands, I obey. 2020-01-20 20:22:09 -05:00
ShadeAware
851815f9c4 Update recipes_weapon_and_ammo.dm 2020-01-20 18:50:57 -05:00
ShadeAware
9f488c80a1 Update weaponry.dm 2020-01-20 18:49:04 -05:00
ShadeAware
6f243f9c44 Update weaponry.dm 2020-01-20 18:08:05 -05:00
ShadeAware
cd001411e1 Update recipes_weapon_and_ammo.dm 2020-01-20 18:02:07 -05:00
ShadeAware
ffef7cd4db Update weaponry.dm 2020-01-20 17:33:18 -05:00
Ghom
4c6af66050 Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16 
Grenades can now actually have their timers adjusted
 2020-01-20 20:02:06 +01: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
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
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
b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -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
90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -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
cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -08: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
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
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
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
Lin
760bbfa8b6 Merge pull request #10571 from Ghommie/Ghommie-cit507 
Riot foam dart design cost consistency.
 2020-01-18 20:46:16 +00:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00
Ghom
ce2fc37df3 Merge pull request #10501 from Putnam3145/more-atmos 
Adds a couple relief valves
 2020-01-18 20:16:30 +01:00
Ghom
9f2bc48d74 Merge pull request #10600 from Kraseo/ricetriangles 
Fixes sprinkles on jelly donuts + lack of berry juice
 2020-01-18 18:52:14 +01:00
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +01:00
Ghom
c00be1a9b1 Merge pull request #10586 from Tupinambis/RLDNerf 
Nerfs RLDs because they hard counter nightmares and night ops.
 2020-01-18 17:42:30 +01:00
Ghom
29c3e72335 You jelly. 2020-01-18 17:41:31 +01:00
Ghom
5a613809f5 Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix 
Fixed gibtonite instantly exploding on pick mining
 2020-01-18 16:54:52 +01:00
Putnam
133cb89b32 hilbert's hotel for ghost dojo 2020-01-18 06:55:26 -08:00
Kraseo
6708607073 fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly 2020-01-18 15:05:07 +01:00
Putnam
b30948a60a Fixed gibtonite instantly exploding on pick mining 2020-01-18 04:37:44 -08:00
Putnam
95dc861ad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter 2020-01-18 03:39:35 -08:00
Putnam
c612462b8c some demodularization + new eligibility stuff 2020-01-18 03:39:27 -08:00