Commit Graph
2620 Commits
Author SHA1 Message Date
LetterJayandGitHub b217a804b6 Merge pull request #3130 from Citadel-Station-13/upstream-merge-31238
[MIRROR] Space vision fix V2.0 - GAME_PLANE change
2017-10-04 18:44:08 -04:00
LetterJayandGitHub 4610a7a61d Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180
[MIRROR] removes carp piggyback exploit
2017-10-04 18:43:31 -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 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
LetterJayandGitHub 6fe3f2a6b9 Merge pull request #3105 from Citadel-Station-13/upstream-merge-31125
[MIRROR] Fixes stealth nerf to detectives gun
2017-10-04 18:40:56 -04:00
orangesandCitadelStationBot c22f4a044d Merge pull request #31238 from AnturK/specialeyes
Space vision fix V2.0 - GAME_PLANE change
2017-10-04 15:14:07 -05:00
kevinz000andCitadelStationBot 9e59a29e35 Update projectile.dm (#31180) 2017-10-04 14:51:16 -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
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
LetterJayandGitHub d8d75099e5 Merge pull request #3115 from Citadel-Station-13/upstream-merge-31241
[MIRROR] Makes gutlunches hungry for gibs again
2017-10-04 12:28:14 -04:00
LetterJayandGitHub 4959746caf Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237
[MIRROR] Server tools API update to 3.1.0.1
2017-10-04 12:27:53 -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
LetterJayandGitHub 05d9c9d3a2 Merge pull request #3104 from Citadel-Station-13/upstream-merge-31181
[MIRROR] Blobs now take damage from particle accelerators
2017-10-04 02:13:35 -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 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 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 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 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 0206e3f775 Update particle.dm 2017-10-03 18:48:18 -05:00
orangesandCitadelStationBot 2ec77d2d9b Merge pull request #31237 from Cyberboss/STAPIUpdate
Server tools API update to 3.1.0.1
2017-10-03 18:47:51 -05: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
KorPhaeronandCitadelStationBot 037ea0ce13 Nightmare organs 2017-10-03 18:22:01 -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
Supermichael777andCitadelStationBot d69c6615a8 Fixes stealth nerf to detectives gun (#31125)
* Fixes stealthnerf to detectives gun

Having knockdown healed stamina damage, but also needed stamina too keep you down. This rectifies the extra stamina healing

* WEW LADS
2017-10-03 18:14:01 -05:00
MoreRobustThanYouandCitadelStationBot f78d0988ab Blobs now take damage from particle accelerators 2017-10-03 18:12:52 -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
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
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
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 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
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
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
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
JohnandGitHub 42cfb61f42 Edited regen
Made it proper
2017-10-03 01:55:50 -05:00