shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

17225 Commits

Author SHA1 Message Date
Thalpy
db74091dd4 Strange revert 2019-11-21 19:47:00 +00:00
Thalpy
7460c28b60 Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL 2019-11-21 19:39:58 +00:00
Thalpy
0cce3a01f4 Ghommie's requiem 2019-11-21 19:39:55 +00:00
Thalpy
a0a52018f3 Apply suggestions from code review 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 19:06:34 +00:00
Thalpy
da1da717d2 Update code/game/objects/items/devices/scanners.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 19:03:48 +00:00
Thalpy
bd07ff4bf7 This should be the one! 2019-11-21 18:55:43 +00:00
Unknown
4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Thalpy
00bffba7ea Why do surgeries always end up with jank 2019-11-21 15:57:21 +00:00
Thalpy
46076c95c7 Ghommie is a good friend 2019-11-21 14:22:04 +00:00
Thalpy
8256a206cf Update code/modules/surgery/emergency_cardioversion_recovery.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 13:24:57 +00:00
Useroth
29ae9eb962 Added reagent IDs. 2019-11-21 12:52:49 +01:00
Persi
863b2398ac Removes the night vision quirk 2019-11-21 06:19:37 -05:00
Useroth
2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Ghommie
bfeece4c6e fixing a get_idcard runtime. The betrayal of the ?. 2019-11-21 09:23:05 +01:00
Ghommie
ee73806616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352 2019-11-21 09:18:14 +01:00
loginsandylogout
a95b78af52 Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 00:52:52 -06:00
Ghommie
6a0bd7c925 THE REVENGE OF THE WHITESPACES 2019-11-21 07:40:49 +01:00
Ghommie
5153ed04ec aaa 2019-11-21 06:48:26 +01:00
Ghommie
911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 2019-11-21 06:36:59 +01:00
Ghommie
dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
Unknown
71b3b8fdc6 Ports/Adds new Berets 
Ports some berets adds even more to most jobs
 2019-11-20 22:21:20 -07:00
kevinz000
c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix 
Makes sure every dynamic-triggered event isn't random on dynamic
 2019-11-20 22:12:42 -07:00
kevinz000
1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds 
Adds strange seeds as a buyable traitor botanist item.
 2019-11-20 22:09:53 -07:00
kevinz000
61c759f7a2 Merge pull request #9865 from Useroth/bagsort 
Glitchfix. Prevents storage bags from changing the order of their numbered contents when items are removed.
 2019-11-20 22:09:22 -07:00
kevinz000
30aefd050a Merge pull request #9868 from Ghommie/Ghommie-cit376 
Fixes superlube waterflower.
 2019-11-20 22:08:54 -07:00
Seris02
60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
nik707
8d363b8e9d Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85 
adds poll ignore for magical antagonists
 2019-11-20 23:03:39 -06:00
kevinz000
42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix 
Makes dynamic nukeops population scaling more like secret
 2019-11-20 22:01:49 -07:00
nik707
0300927974 Merge pull request #9487 from Citadel-Station-13/spooky 
adds an easy way for admins to force enable halloween races without the rest of halloween's code
 2019-11-20 23:00:09 -06:00
nik707
56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107 
buffs bluespace apprentice (targeted teleport --> blink)
 2019-11-20 22:55:21 -06:00
kevinz000
540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat 
Makes meteor not repeatable in dynamic.
 2019-11-20 21:53:05 -07:00
nik707
28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109 
emagged medibots now murder the everloving fuck out of slimepeople
 2019-11-20 22:52:11 -06:00
nik707
df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110 
fixes a bug with rnd multiprinting
 2019-11-20 22:51:32 -06:00
nik707
6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111 
Is it the time of year to buff disablers again?
 2019-11-20 22:51:11 -06:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000
c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378 
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
 2019-11-20 21:48:41 -07:00
kevinz000
4b41a70e13 Merge pull request #9875 from Putnam3145/required-candidates-works-now 
Makes from-ghosts rulesets cancel if fewer than required candidates
 2019-11-20 21:47:48 -07:00
kevinz000
47888bd208 Merge pull request #9877 from Ghommie/Ghommie-cit381 
Unmodularize pAI holo-chassis icons.
 2019-11-20 21:47:00 -07:00
kevinz000
f82dd255dc Merge pull request #9869 from Hatterhat/ayy-dna-manip 
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
 2019-11-20 21:46:37 -07:00
kevinz000
95951add5c Merge pull request #9870 from Ghommie/Ghommie-cit377 
Moves some clockie paper info to the right file.
 2019-11-20 21:43:35 -07:00
Fermi
b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00:00
GrayRachnid
4ae76cf1d9 WHY 
D
 2019-11-20 23:11:46 -05:00
Fermi
b90213882e Again with the rouge 2019-11-21 03:58:16 +00:00
Fermi
01f465dc8c Scanner formatting 2019-11-21 03:52:00 +00:00
Ghommie
2e55495557 ayy 2019-11-21 04:48:42 +01:00
Ghommie
399a5080da Fixing cyborg camera interaction for real 2019-11-21 04:42:49 +01:00
Fermi
18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
Putnam
c40cad1658 Starting an explosion rework, fun fun 2019-11-20 19:01:59 -08:00
Putnam
435d2f893e Makes roundend threat log only show actual changes. 2019-11-20 18:31:39 -08:00
Fermi
cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00