951c9d04f2
Merge pull request #31261 from AnturK/lockedslot
...
Fixes species locked slots alpha.
2017-10-04 06:12:46 -05:00
cdc7695741
Makes gutlunches hungry for gibs again ( #31241 )
...
* gutlunch fix
* combine ifs, removes unneeded check
2017-10-04 04:11:33 -05:00
0515d2b754
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
...
[MIRROR] Nightmare organs
2017-10-04 02:14:22 -04:00
719b433ede
Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179
...
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
2017-10-04 02:14:07 -04:00
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
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
0830e6907e
Merge pull request #3093 from Kevak/Shock-Collars
...
Shock Collars Are Now A Thing.
2017-10-03 20:16:10 -04:00
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
1c199d426b
Merge branch 'master' into upstream-merge-31034
2017-10-03 20:15:07 -04:00
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
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
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
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
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
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
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
befcfd1f06
Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202
...
[MIRROR] Organ initialization cleanup
2017-10-03 20:10:08 -04:00
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
b9967e6453
Update medical.dm
2017-10-03 18:48:43 -05:00
0206e3f775
Update particle.dm
2017-10-03 18:48:18 -05:00
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
dc9b438bd8
Update skeletons.dm
2017-10-03 18:47:01 -05:00
e4d6219f1d
Update brain_item.dm
2017-10-03 18:46:41 -05:00
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
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
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
1782fbeed7
Adds the advanced medical scanner, gives one to the CMO
2017-10-03 18:16:29 -05:00
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
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
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
f78d0988ab
Blobs now take damage from particle accelerators
2017-10-03 18:12:52 -05:00
4e648765db
Ports dash weapons to the dash datum
2017-10-03 18:11:42 -05:00
3310d73b7f
Greatly speeds up bees ( #31250 )
...
* Bee perf
* requested changes
2017-10-03 18:04:28 -05:00
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
f1dfc1b6db
Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss
...
Partial revert of #30763 (datum config refactor)
2017-10-03 17:55:05 -05:00
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
d98cd745dd
Fixes morgue maintenance radstorm protection ( #31253 )
...
* Morgue maint area
* Fixed typo
2017-10-03 17:11:57 -05:00
159835db24
Fixes humans having no examine feedback for soft crit ( #31247 )
...
* Soft crit examine
* Concise
2017-10-03 15:30:57 -05:00
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
fd5acc5573
Organ initialization cleanup
2017-10-03 14:18:39 -05:00
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
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
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
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
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
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
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
f4ce4a3a27
Shock Collars Are Now A Thing.
...
Exactly what it says on the tin.
2017-10-03 08:03:03 -07:00
0888d3944e
Merge pull request #31210 from MoreRobustThanYou/patch-7
...
Silicons can no longer take brain damage
2017-10-03 06:20:51 -05:00
a64e2fd25e
Merge pull request #31233 from kevinz000/patch-306
...
Fixes floating bullet holes
2017-10-03 06:18:41 -05:00
Leo