shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,173 Commits 5 Branches 0 Tags
315967bd1563d1979701f68e8b9d3de1953d4029
Commit Graph
4386 Commits
Author SHA1 Message Date
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 0830e6907e Merge pull request #3093 from Kevak/Shock-Collars 
Shock Collars Are Now A Thing.
 2017-10-03 20:16:10 -04: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 d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232 
[MIRROR] Fixes mech fab runtime
 2017-10-03 20:13:06 -04:00
LetterJayandGitHub 3e975eca09 Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135 
[MIRROR] Adds a var to minds that makes them immune to conversion
 2017-10-03 20:12:43 -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 c522e7a6e8 Merge pull request #3101 from Citadel-Station-13/upstream-merge-31236 
[MIRROR] Monkey Cubes expanding will give the new monkey an attack log with their creator
 2017-10-03 20:11:13 -04:00
LetterJayandGitHub 8fd4ca0fe4 Merge pull request #3100 from Citadel-Station-13/upstream-merge-31252 
[MIRROR] Partial revert of #30763 (datum config refactor)
 2017-10-03 20:10:56 -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 601ccec26f Merge pull request #3098 from Citadel-Station-13/upstream-merge-31253 
[MIRROR] Fixes morgue maintenance radstorm protection
 2017-10-03 19:49:37 -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
ArmhulenandCitadelStationBot 65a73bcefa Gives nightmares a random shadowling name (#31188) 
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
 2017-10-03 18:41:37 -05:00
AnturKandCitadelStationBot 67f0c2f41c Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-03 18:19:40 -05:00
orangesandCitadelStationBot 5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable 
Adds a var to minds that makes them immune to conversion
 2017-10-03 18:15:20 -05:00
orangesandCitadelStationBot baa53ba1d3 Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA 
Makes mobs on fire light up
 2017-10-03 18:14:10 -05:00
vuonojenmustaturskaandCitadelStationBot 3310d73b7f Greatly speeds up bees (#31250) 
* Bee perf

* requested changes
 2017-10-03 18:04:28 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot 126020185d Monkey Cubes expanding will give the new monkey an attack log with their creator (#31236) 
* Update snacks_meat.dm

* no one wants to see that

* WE'RE JUST SENDING IT TO ONE PLACE COBBY

* boop

* cool leoz tricks

* Update snacks_meat.dm
 2017-10-03 17:56:14 -05:00
Jordan BrownandCitadelStationBot f1dfc1b6db Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss 
Partial revert of #30763 (datum config refactor)
 2017-10-03 17:55:05 -05:00
kevinz000andCitadelStationBot 21cfddd426 fixes healguardians not being able to heal people (#31228) 
* Update guardian.dm

* Update support.dm

* Update guardian.dm
 2017-10-03 17:48:50 -05:00
ShizCalevandCitadelStationBot d98cd745dd Fixes morgue maintenance radstorm protection (#31253) 
* Morgue maint area

* Fixed typo
 2017-10-03 17:11:57 -05:00
KorPhaeronandCitadelStationBot 159835db24 Fixes humans having no examine feedback for soft crit (#31247) 
* Soft crit examine

* Concise
 2017-10-03 15:30:57 -05:00
LetterJayandGitHub 05f5ee73ce Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage 
Podpeople available as roundstart ft. minor stat changes
 2017-10-03 15:22:43 -04:00
AnturKandCitadelStationBot fd5acc5573 Organ initialization cleanup 2017-10-03 14:18:39 -05:00
Kevak ba99e3845a Added normal collar functionality. 
You can now name your victim's collars on top of other functionality.
 2017-10-03 12:12:52 -07:00
LetterJayandGitHub 159924f42b Merge pull request #3092 from Citadel-Station-13/upstream-merge-31210 
[MIRROR] Silicons can no longer take brain damage
 2017-10-03 12:32:19 -04:00
LetterJayandGitHub 0b7ef4d90f Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233 
[MIRROR] Fixes floating bullet holes
 2017-10-03 12:31:59 -04:00
LetterJayandGitHub 4637fcb75c Merge pull request #3090 from Citadel-Station-13/upstream-merge-31231 
[MIRROR] Fixes alt-click runtime
 2017-10-03 12:30:37 -04:00
LetterJayandGitHub c596539fbf Merge pull request #3089 from Citadel-Station-13/upstream-merge-31219 
[MIRROR] Makes antimatter code less shit
 2017-10-03 12:30:02 -04:00
LetterJayandGitHub 660e9fea9c Merge pull request #3088 from Citadel-Station-13/upstream-merge-30846 
[MIRROR] Fixes/tweaks wormholes event and portals
 2017-10-03 12:29:46 -04:00
LetterJayandGitHub 887e6799e0 Merge pull request #3087 from Citadel-Station-13/upstream-merge-31217 
[MIRROR] makes /turf/Enter() faster, and also makes CollidedWith async
 2017-10-03 12:29:30 -04:00
Kevak f4ce4a3a27 Shock Collars Are Now A Thing. 
Exactly what it says on the tin.
 2017-10-03 08:03:03 -07:00
LeoandCitadelStationBot 0888d3944e Merge pull request #31210 from MoreRobustThanYou/patch-7 
Silicons can no longer take brain damage
 2017-10-03 06:20:51 -05:00
LeoandCitadelStationBot a64e2fd25e Merge pull request #31233 from kevinz000/patch-306 
Fixes floating bullet holes
 2017-10-03 06:18:41 -05:00
LeoandCitadelStationBot cdfc5ffc0c Merge pull request #31231 from AnturK/longenoughiruntimelogtopissmeoff 
Fixes alt-click runtime
 2017-10-03 06:18:33 -05:00
MoreRobustThanYouandCitadelStationBot f870b66b31 Makes antimatter code less shit (#31219) 
* Antimatter shielding that can't find a control unit won't delete itself anymore

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* gthruhru

* thanks Antur
 2017-10-03 04:40:47 -05:00
kevinz000andCitadelStationBot 3b3b45c03c Fixes/tweaks wormholes event and portals (#30846) 
* fix

* THERE WE GO

* Update portals.dm
 2017-10-03 04:37:35 -05:00
vuonojenmustaturskaandCitadelStationBot ebca0173f3 makes /turf/Enter() faster, and also makes CollidedWith async (#31217) 
* makes /turf/Enter faster, maybe

* waitfor false on atom/collidedwith
 2017-10-03 04:33:23 -05:00
Michiyamenotehifunana 8ac574108e Brings 10mm Soporific Description in-line with its nerfed stats 
D'oh. Completely forgot about this. Now no one can complain that their rape gun instructions tell them 2 shots is enough when 3 is what you actually need.
 2017-10-03 17:24:36 +08:00
Michiyamenotehifunanaandkevinz000 4e31a45154 Nerf to 10mm Soporific Bullets (#3085) 
Makes it require 3 shots instead of just 2 to put your victim to sleep.
 2017-10-03 02:18:42 -07:00
LetterJay ef671d8764 OOOOOOOH SHIIIIIIIIIIT 2017-10-03 03:55:05 -05:00
LetterJay 3a90891019 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-03 03:42:26 -05:00
LetterJay b95d35d56d FUCK. 2017-10-03 03:42:13 -05:00
LetterJayandGitHub c8c5af25fe Update custom_items.dm 2017-10-03 03:31:49 -05:00
JohnandGitHub 42cfb61f42 Edited regen 
Made it proper
 2017-10-03 01:55:50 -05:00
JohnandGitHub 221404bffb cleaned up some things 2017-10-03 01:42:18 -05:00
CitadelStationBotandkevinz000 dffcebf4ff [MIRROR] Remove ash drake hide from lesser ash drakes butcher loot (#2938) 
* Merge pull request #30884 from Arianya/patch-1

Remove ash drake hide from lesser ash drakes butcher loot

* Remove ash drake hide from lesser ash drakes butcher loot
 2017-10-02 23:20:55 -07:00
CitadelStationBotandkevinz000 1e309deac0 [MIRROR] Wizard can't cast shout or whisper spells when he is unable to speak (#2965) 
* Wizard being mute now blocks touch attacks from activating (can still be cast)

* Wizard can't cast shout or whisper spells when he is unable to speak
 2017-10-02 23:20:46 -07:00