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
e66e99776f
Automatic changelog generation for PR #3096 [ci skip]
2017-10-03 18:49:24 -05:00
6e5322a722
Merge pull request #3096 from Citadel-Station-13/upstream-merge-31247
...
[MIRROR] Fixes humans having no examine feedback for soft crit
2017-10-03 19:49:22 -04: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
c053059b82
Greatly speeds up bees
2017-10-03 18:04:28 -05:00
3310d73b7f
Greatly speeds up bees ( #31250 )
...
* Bee perf
* requested changes
2017-10-03 18:04:28 -05:00
1f6dedfb91
Monkey Cubes expanding will give the new monkey an attack log with their creator
2017-10-03 17:56:14 -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
a68d44e151
Partial revert of #30763 (datum config refactor)
2017-10-03 17:55:05 -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
41f1d56894
fixes healguardians not being able to heal people
2017-10-03 17:48:50 -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
34a03f048d
Fixes morgue maintenance radstorm protection
2017-10-03 17:11:58 -05:00
d98cd745dd
Fixes morgue maintenance radstorm protection ( #31253 )
...
* Morgue maint area
* Fixed typo
2017-10-03 17:11:57 -05:00
d6ed2ecd05
Fixes humans having no examine feedback for soft crit
2017-10-03 15:30: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
aec96bbbbe
Merge pull request #2906 from deathride58/ashwalkerkinkmates
...
Adds dildos to ashwalker ruin
2017-10-03 15:23:07 -04:00
49a354d752
Automatic changelog generation for PR #2922 [ci skip]
2017-10-03 14:22:46 -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
06fe1e8da6
Automatic changelog generation for PR #3092 [ci skip]
2017-10-03 11:32:21 -05: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
ca61069ecb
Automatic changelog generation for PR #3089 [ci skip]
2017-10-03 11:30:04 -05: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
5fdeb55876
Automatic changelog generation for PR #3088 [ci skip]
2017-10-03 11:29:49 -05: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
01a56ddcb9
Automatic changelog generation for PR #3086 [ci skip]
2017-10-03 11:29:15 -05:00
67f54c0b11
Merge pull request #3086 from Michiyamenotehifunana/soporificdescriptionfix
...
Brings the 10mm Soporific Magazine Uplink Description in line with its nerfed stats
2017-10-03 12:29:13 -04:00
993896df51
Silicons can no longer take brain damage
2017-10-03 06:20:51 -05: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
fd6c202178
Fixes floating bullet holes
2017-10-03 06:18:41 -05:00
a64e2fd25e
Merge pull request #31233 from kevinz000/patch-306
...
Fixes floating bullet holes
2017-10-03 06:18:41 -05:00
025037351a
Fixes alt-click runtime
2017-10-03 06:18:33 -05:00
cdfc5ffc0c
Merge pull request #31231 from AnturK/longenoughiruntimelogtopissmeoff
...
Fixes alt-click runtime
2017-10-03 06:18:33 -05:00
37afe16a0d
Makes antimatter code less shit
2017-10-03 04:40:47 -05:00
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
c13a7539c9
Fixes/tweaks wormholes event and portals
2017-10-03 04:37:36 -05:00
3b3b45c03c
Fixes/tweaks wormholes event and portals ( #30846 )
...
* fix
* THERE WE GO
* Update portals.dm
2017-10-03 04:37:35 -05:00
0743b4c5ca
makes /turf/Enter() faster, and also makes CollidedWith async
2017-10-03 04:33:23 -05:00
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
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
LetterJay