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

11123 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Fermi
b911fabb37 Okay bedtime 2019-11-21 04:25:25 +00: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
Fermi
cc53a0061f Well it compiles 2019-11-21 02:15:58 +00:00
Fermi
bfb5f75016 Finishing up final UI adjustments 2019-11-20 21:23:54 +00:00
Ghommie
920eba0b03 ayy 2019-11-20 21:41:59 +01:00
Ghommie
aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Ghommie
ac44bfcad2 chem dispenser beakers and bikehorn fixes. 2019-11-20 17:55:11 +01:00
loginsandylogout
5395e0c893 meme 2019-11-20 10:35:40 -06:00
Useroth
b91d0e27da An alternative solution to the problems with blackpowder. 2019-11-20 15:49:04 +01:00
Useroth
2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Thalpy
ebe3859cc5 syncs size 2019-11-20 13:28:35 +00:00
Fermi
4dd8223634 Undoes circuitboards and converts to sleeper. 2019-11-20 11:58:06 +00:00
Fermi
48e1c64c8d Final 2019-11-20 11:35:40 +00: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
75ac087988 Unmodularize pAI holo-chassis icons. 2019-11-20 05:54:00 +01:00
kevinz000
20bcca0398 Merge pull request #9852 from Ghommie/Ghommie-cit369 
Fixing some wizard den teleportation issues.
 2019-11-19 21:39:20 -07:00
kevinz000
67abc4ff03 Merge pull request #9855 from Ghommie/Ghommie-cit371 
Fixing suit store overlays
 2019-11-19 21:38:22 -07:00
kevinz000
c1a416e257 Merge pull request #9858 from Ghommie/Ghommie-cit372 
Fixing gasping xenos.
 2019-11-19 21:37:17 -07:00
kevinz000
d692d3fe01 Merge pull request #9835 from Ghommie/Ghommie-cit363 
Ports "Self sustaining fix"
 2019-11-19 21:32:57 -07:00
kevinz000
755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364 
Ports "Uses defines for turf atmos"
 2019-11-19 21:32:42 -07:00
kevinz000
a012347c52 Merge pull request #9837 from Ghommie/Ghommie-cit365 
Ports "Fixes an Ancient LINDA Bug"
 2019-11-19 21:32:23 -07:00
kevinz000
9e5f697838 Merge pull request #9842 from NopemanMcHalt/dab-op-plus 
Fixes D.A.B. loadout name
 2019-11-19 21:31:47 -07:00
kevinz000
c7765a032b Merge pull request #9844 from Putnam3145/dynamic-midround-wizard-tweak 
Dynamic summon events tweaks
 2019-11-19 21:31:14 -07:00