shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,598 Commits 5 Branches 0 Tags
04006b2ad2758bd6c8b524e4f0a7c03c4cad626a
Commit Graph
1012 Commits
Author SHA1 Message Date
LetterJayandGitHub 233388a345 Merge pull request #3194 from Citadel-Station-13/upstream-merge-31347 
[MIRROR] Makes put_in_hands use drop_location()
 2017-10-07 01:08:10 -04:00
LetterJayandGitHub 03bd841ac3 Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344 
[MIRROR] Lightgeists are gold core spawnable
 2017-10-07 01:07:03 -04:00
LetterJayandGitHub 7e547fa2cd Merge pull request #3189 from Citadel-Station-13/upstream-merge-31359 
[MIRROR] Adds Wumborian Fugu to the gold core spawn
 2017-10-07 01:06:46 -04:00
LetterJayandGitHub 46ec25b161 Merge pull request #2603 from deathride58/crewobjectivesandmiscreants 
Ports Goon's Crew Objectives (feat. objectives from old Hippie) and Miscreants
 2017-10-07 01:02:37 -04:00
Jordan BrownandCitadelStationBot ebcacc733f Makes put_in_hands use drop_location() (#31347) 2017-10-06 21:36:57 -05:00
ArmhulenandCitadelStationBot a42bf62334 Lightgeists are gold core spawnable (#31344) 
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.

* ez

* honk
 2017-10-06 21:30:23 -05:00
ArmhulenandCitadelStationBot 0a3949968d Makes Wumborian Fugu gold core spawnable (#31359) 2017-10-06 21:28:04 -05:00
deathride58 39d3897b29 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-06 09:39:20 -04:00
orangesandCitadelStationBot 5a390937ae Fix spelling of conscious 2017-10-06 01:34:33 -05:00
LetterJayandGitHub 020b3b1160 Merge pull request #3163 from Citadel-Station-13/upstream-merge-31240 
[MIRROR] Emotes now shatter 80% less immersions
 2017-10-06 02:12:43 -04:00
LetterJayandGitHub 6546804c38 Merge pull request #3159 from Citadel-Station-13/upstream-merge-30525 
[MIRROR] Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
 2017-10-06 02:12:06 -04:00
RobustinandCitadelStationBot c8e5928517 Emotes now shatter 80% less immersions (#31240) 
* Emote Checks by Default

* Removes emote argument

* More emote fixes

* Overhauled emote check

* Closed Spans
 2017-10-05 15:11:28 -05:00
XDTMandCitadelStationBot 5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
Jordan BrownandCitadelStationBot f91dc76e1a Merge pull request #31310 from ShizCalev/lobby-timer-fix 
Fixes lobby timer showing as delayed when it's just waiting for more players
 2017-10-05 09:21:43 -05:00
LetterJayandGitHub cf37555c4d Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302 
[MIRROR] Move shuttleRotate into the shuttle module
 2017-10-05 09:13:41 -04:00
LetterJayandGitHub a1ae6add27 Merge pull request #3152 from Citadel-Station-13/upstream-merge-31296 
[MIRROR] Cleans up and fixes old landmarks
 2017-10-05 09:12:35 -04:00
LetterJayandGitHub f418c066c6 Merge pull request #3144 from Citadel-Station-13/upstream-merge-31299 
[MIRROR] Experimental fix for #29663
 2017-10-05 08:45:55 -04:00
LetterJayandGitHub 29aafaf42d Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286 
[MIRROR] ismachinery define
 2017-10-05 08:32:10 -04:00
orangesandCitadelStationBot bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 03:05:40 -05:00
orangesandCitadelStationBot cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
RandomMarineandCitadelStationBot fb7a0d7606 Experimental fix for bloom issue (#31299) 2017-10-04 23:25:06 -05:00
LetterJayandGitHub d4cd519730 Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276 
[MIRROR] Moves laughter to the emote
 2017-10-04 22:01:49 -04:00
LeoandCitadelStationBot 39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
deathride58 5692228379 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:41 -04:00
deathride58 5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
LetterJayandGitHub 3fdc29ba42 Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283 
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
 2017-10-04 18:45:09 -04:00
LetterJayandGitHub ecf44ff651 Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150 
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
 2017-10-04 18:44:21 -04:00
LetterJayandGitHub e6ccc7077a Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279 
[MIRROR] why plus a minus value and not just minus the value...
 2017-10-04 18:43:04 -04:00
LetterJayandGitHub cfd98caf98 Update emote.dm 2017-10-04 17:42:38 -05:00
LetterJayandGitHub 8c77408bb1 Merge pull request #3114 from Daniel0Mclovin/patch-2 
Rebalanced pod people so they arnt as weak.
 2017-10-04 18:42:02 -04:00
LetterJayandGitHub 944c749dfc Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256 
[MIRROR] Zombies regen toxin damage
 2017-10-04 18:41:45 -04:00
ShizCalevandCitadelStationBot 929c737dfe Fixes shaking people up while buckled into a bed/resin nest (#31283) 
* Fixes shaking people up when buckled into bed

* CB
 2017-10-04 17:01:27 -05:00
ShizCalevandCitadelStationBot 4d23dd56b8 Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150) 
* Hides ninja socks, draining updated to DisplayPower

* CB

* KEEP_TOGETHER
 2017-10-04 16:29:30 -05:00
LetterJayandGitHub 77c422d011 Update emote.dm 2017-10-04 16:11:24 -05:00
kevinz000andCitadelStationBot 1a3fc9f1c6 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:03:20 -05:00
Jordan BrownandCitadelStationBot 441514937e Moves laughter to the emote 2017-10-04 12:20:23 -05:00
LetterJayandGitHub 282dcb3c16 Merge pull request #3121 from Citadel-Station-13/upstream-merge-31267 
[MIRROR] Dummies used for preference setup always immediately compile their overlays
 2017-10-04 12:29:21 -04:00
Jordan BrownandCitadelStationBot cbf7ff0fc7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 11:03:47 -05:00
LeoandCitadelStationBot c03513b65d Merge pull request #31256 from ShizCalev/zombie-toxin 
Zombies regen toxin damage
 2017-10-04 06:14:57 -05:00
vuonojenmustaturskaandCitadelStationBot cdc7695741 Makes gutlunches hungry for gibs again (#31241) 
* gutlunch fix

* combine ifs, removes unneeded check
 2017-10-04 04:11:33 -05:00
LetterJayandGitHub 0515d2b754 Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034 
[MIRROR] Nightmare organs
 2017-10-04 02:14:22 -04:00
JohnandGitHub 315967bd15 Rebalanced pod people so they arnt as weak. 
This will allow podpeople to regen at a steady pace without them being able to take tool boxes to the head like candy. it takes around 15 seconds to notably heal compared to the 40 it does just for a little bit and the 3 from before it was nerfed. The fact that podpeople need to go to the medbay to fix burn damage made me decide to make their brute regen stronger, not to mention that a single welder smach gives 18.75 damage and a shot to the leg with a laser carbine does 25 burn damage.
 2017-10-03 23:10:50 -05:00
LetterJayandGitHub 454fb160a8 Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188 
[MIRROR] Gives nightmares a random shadowling name
 2017-10-03 20:15:31 -04:00
LetterJayandGitHub 1c199d426b Merge branch 'master' into upstream-merge-31034 2017-10-03 20:15:07 -04:00
LetterJayandGitHub 84d98d5973 Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208 
[MIRROR] Makes mobs on fire light up
 2017-10-03 20:12:24 -04:00
LetterJayandGitHub b5e0981d62 Merge pull request #3102 from Citadel-Station-13/upstream-merge-31250 
[MIRROR] Greatly speeds up bees
 2017-10-03 20:11:25 -04:00
LetterJayandGitHub a3cea89134 Merge pull request #3099 from Citadel-Station-13/upstream-merge-31228 
[MIRROR] fixes healguardians not being able to heal people
 2017-10-03 20:10:42 -04:00
LetterJayandGitHub befcfd1f06 Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202 
[MIRROR] Organ initialization cleanup
 2017-10-03 20:10:08 -04:00
LetterJayandGitHub dc9b438bd8 Update skeletons.dm 2017-10-03 18:47:01 -05:00
LetterJayandGitHub e4d6219f1d Update brain_item.dm 2017-10-03 18:46:41 -05:00