shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,116 Commits 5 Branches 0 Tags
cebf2d2de293fc40f344da3ee8a478e3bdb9e6bb
Commit Graph

16606 Commits

Author SHA1 Message Date
Seris02
cebf2d2de2 does putnam's suggestion 
I edited this on a web browser so if it breaks blame putnam
 2019-12-02 00:30:20 +08:00
Seris02
136698ce7d Merge branch 'sleepingcarphallucination' of https://github.com/Seris02/Citadel-Station-13 into sleepingcarphallucination 2019-11-30 10:26:21 +08:00
Seris02
9788586bb2 fixes some things :hjonk: 2019-11-30 10:23:22 +08:00
Seris02
84c2b7cef6 Update code/modules/flufftext/Hallucination.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-30 10:02:23 +08:00
Seris02
a4fb86df48 forgot to add it to the list of hallucinations you can have 2019-11-30 01:00:23 +08:00
Seris02
1e8227346c adds sleeping carp wrist wrench/violent grab hallucination 2019-11-30 00:50:27 +08: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
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
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
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
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
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
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
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