cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,146 Commits 55 Branches 0 Tags
4e05c27cdbabaf4eaf3ac185f9810c78fba8bdbb
Commit Graph

16629 Commits

Author SHA1 Message Date
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
Putnam3145
8219d298a5 Merge pull request #9942 from Useroth/new-tg-plants 
[Hotfix] Fixed the reagents in the new plants.
 2019-11-25 04:39:20 -08:00
Useroth
99300229a1 Fixed the reagents in the new plants. 2019-11-25 13:35:26 +01:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
GrayRachnid
0b60d5e6ef derp 2019-11-24 17:48:09 -05:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
BlackMajor
6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants 
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
 2019-11-25 11:30:43 +13:00
BlackMajor
47b5dbeaaa Merge pull request #9625 from Ghommie/Ghommie-cit277 
Unmodularize digi/muzzled clothing sprites.
 2019-11-25 11:30:31 +13:00
Lin
7481661182 Merge pull request #9907 from Putnam3145/midround-Vr-fix 
[DYNAMIC] Prevents VR mobs from being midround antags.
 2019-11-24 20:01:36 +00:00
Useroth
6a59cc1c99 Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle. 2019-11-24 10:14:16 +01:00
kevinz000
f0996208a3 Merge pull request #9874 from Ghommie/Ghommie-cit379 
Honkbot slip and slide fun ride.
 2019-11-23 11:49:32 -07:00
kevinz000
aba39f0b36 Merge pull request #9891 from Putnam3145/dynamic-traitor-fix 
[DYNAMIC] Reverted making latejoiners count for roundstart rulesets
 2019-11-23 11:46:28 -07:00
kevinz000
f28a6feb5f Merge pull request #9881 from Putnam3145/persistent-dynamic-weights 
Allows extended voting on dynamic if recent rounds too chaotic
 2019-11-23 11:45:58 -07:00
kevinz000
be679b97a6 Merge pull request #9885 from Commandersand/cuckcult 
Makes the brass skewer more ouchie than ouchie~
 2019-11-23 11:45:24 -07:00
kevinz000
f88ed98ee4 Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert 
Anthromorphic Insect Revert
 2019-11-23 11:44:52 -07:00
kevinz000
75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238 
What do you mean I cant hold the armory on my back? -BOH nerf
 2019-11-23 11:42:37 -07:00
kevinz000
88762c5d89 Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand 
Able to use Legion Cores in-hand
 2019-11-23 11:39:35 -07:00
GrayRachnid
a69b4b4916 removes creep 2019-11-23 02:28:31 -05:00
Lin
e954cec58c Merge pull request #9898 from Ghommie/Ghommie-cit387 
Dreamchecker compatibility changes, part 3.
 2019-11-23 05:52:44 +00:00
Lin
592dcdb6fd Merge pull request #9896 from Ghommie/Ghommie-cit386 
Fixing cyborg camera interaction for real
 2019-11-23 05:52:11 +00:00
Lin
028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383 
Unmodularize closets.
 2019-11-23 05:39:33 +00:00
Putnam3145
037b278e9e Merge pull request #9918 from Ghommie/Ghommie-cit384 
[S] Makes it compile.
 2019-11-22 18:14:41 -08:00
Ghommie
77800cf720 Oh yea it's a list 2019-11-23 03:02:29 +01:00
Ghommie
2d1edf661b Fixes travis. 2019-11-23 02:58:03 +01:00
Putnam3145
ea4fdf727b Merge pull request #9917 from Ghommie/Ghommie-cit384 
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
 2019-11-22 17:06:50 -08:00
Ghommie
82d97ff4a7 This way is better 2019-11-23 01:51:31 +01:00
Ghommie
24c93d9df6 [S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad. 2019-11-23 01:46:59 +01:00
GrayRachnid
77913406ed Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 18:50:24 -05:00
Putnam3145
6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384 
chem dispenser beakers and bikehorn fixes.
 2019-11-22 15:48:28 -08:00
Putnam3145
b7f7342e43 Merge pull request #9900 from Ghommie/Ghommie-cit388 
fixing a get_idcard runtime. or The betrayal of the ?. operator
 2019-11-22 15:41:52 -08:00
GrayRachnid
a7918717ff fixes compile errors. 2019-11-22 18:22:53 -05:00
GrayRachnid
61299fee42 ready for review/testing 2019-11-22 15:32:09 -05:00
GrayRachnid
3544885b73 reverts fermis changes, woops. 2019-11-22 15:26:20 -05:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie
7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-22 18:53:58 +01:00
kiwedespars
98998ca85f un-moths the anthromorphic insects 2019-11-21 19:47:48 -08:00
Lin
522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385 
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
 2019-11-22 02:39:29 +00:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245 
Touching up job outfits equip procs, little PDA fix.
 2019-11-22 02:37:49 +00:00
Lin
3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243 
Ports "You can now click on objects and mobs below flaps and signs"
 2019-11-22 01:36:47 +00:00
Putnam
72a119da2e Prevents VR mobs from being midround antags. 2019-11-21 17:31:22 -08:00
Lin
c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix 
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
 2019-11-22 01:16:35 +00:00
Lin
2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox 
Fixes gold toolbox inhand sprite having the wrong name
 2019-11-22 01:14:39 +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
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