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

17180 Commits

Author SHA1 Message Date
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
Winter Flare
eee8c8c108 Shields Bounty is now 2 for 3000 2019-11-23 03:11:00 -05: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
YakumoChen
038887e27b Adds new AI display options removes duplicate entry 2019-11-23 04:59:52 +00:00
YakumoChen
6ebab6300a Adds AI icons and fixes the comma. Again. 2019-11-23 04:41:36 +00:00
YakumoChen
6d5c4c3bdb Adds AI core display options 2019-11-23 04:35:50 +00:00
YakumoChen
1c8b557466 fixes AI.dm again 2019-11-23 04:13:30 +00:00
YakumoChen
6426e5dade makes the icons not break 2019-11-23 03:54:39 +00:00
YakumoChen
a6ff44782a adds more unique ai holograms 2019-11-23 03:51:04 +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
Fermi
37ac0ccb66 Okay 2019-11-23 00:23:43 +00:00
Fermi
b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
Fermi
399986f3f7 Forgot to update the procs 2019-11-22 23:57:09 +00:00
Fermi
7bbc90d747 makes the freezing list a typecache 2019-11-22 23:56:05 +00: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
Fermi
b056d91ea5 Removes the random love 2019-11-22 23:48:21 +00: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
Trilbyspaceclone
febceaa2d6 Apply suggestions from code review 
grammar

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-22 14:39:31 -05:00
Winter Flare
03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -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
Winter Flare
386dd6aa8a Made Medical Emergency Crate Drop-Pod only. 
Trill made me do it.
 2019-11-22 06:44:59 -05:00
TrilbySpaceClone
b01be3b1ff Merge branch 'master' into crow 2019-11-22 05:48:36 -05:00
Winter Flare
05b22caaa3 Added 12 new crates, fixed issues raised in #9901 
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
 2019-11-22 02:37:57 -05:00
Ghommie
66a97cb224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-22 05:17:42 +01:00
Ghommie
9f6d595ad5 Ouch 2019-11-22 05:08:58 +01:00
kiwedespars
98998ca85f un-moths the anthromorphic insects 2019-11-21 19:47:48 -08:00
TrilbySpaceClone
2136968585 Ring ring 2019-11-21 21:55:17 -05: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