9b8abb39ff
Merge pull request #9441 from Thunder12345/yousawnothing
...
Removes duplicate armoralt state in suit.dmi
2015-05-13 19:44:49 +10:00
e1f5ed793d
Merge pull request #9356 from Firecage/Kudzulogs
...
Adds logs for admins to kudzu.
2015-05-11 23:58:38 +10:00
5dfe2cad16
Merge pull request #9359 from GunHog/Posibrain_Change
...
[DNM] Changes Posibrain activation from pAI style to drone style
2015-05-11 08:32:15 -05:00
c9d2e07466
Merge pull request #9410 from phil235/HeadcrabRuntimeFix
...
Fixes a runtime with headcrabs controled by non changeling players.
2015-05-11 08:18:56 -05:00
c6b0c8b390
Investigate logs for kudzu planting
2015-05-11 15:18:01 +02:00
bf29f46f57
Removes duplicate armoralt state in suit.dmi
2015-05-10 16:52:32 +01:00
7e0e50302a
Merge pull request #9436 from MrStonedOne/powerfixes
...
Merges power subsystem into machine subsystem.
2015-05-10 08:23:20 +01:00
c6c7237265
Merges power subsystem into machine subsystem.
...
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
2015-05-09 23:48:18 -07:00
4628bb7a15
Conflict resolution
...
With myself. I have internal demons.
2015-05-09 11:49:11 -05:00
7c9667db38
Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me
2015-05-09 11:40:44 -05:00
1875f3a9c2
Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
...
Group of fixes
2015-05-09 16:23:46 +02:00
d5f927520d
Merge pull request #9422 from AnturK/borg_fix
...
Fixes increased borg battery drain
2015-05-09 22:17:25 +10:00
5f848a94eb
Fixes increased borg battery drain
2015-05-09 14:07:42 +02:00
67fe7dc25c
Merge pull request #9396 from Firecage/Nodropmutants
...
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-09 22:05:04 +10:00
a73ef787a2
Merge pull request #9380 from SconesC/spooky-faces
...
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-09 22:03:34 +10:00
aafa80dcd8
Merge pull request #9378 from GunHog/diamond_tipped_spirals
...
Fixes the mining borg diamond drill upgrade
2015-05-09 21:45:21 +10:00
4e82cd9689
Merge pull request #9355 from Firecage/OverlaycleanBGone
...
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
279a2653c6
Merge pull request #9347 from SamuelRowe/master
...
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
da28ed2138
Merge pull request #9290 from AnturK/giant_enemy_crab
...
Adds resize variable for mobs
2015-05-09 20:29:55 +10:00
fdeb84021d
Merge pull request #9320 from GunHog/Botcall_V2
...
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
c77fefc937
Merge pull request #9374 from AnturK/abduction_third
...
Abduction fixes
2015-05-09 06:25:23 +01:00
14aa907252
Merge pull request #9407 from phil235/StaminaFix
...
Fixes stamina damage
2015-05-09 06:03:26 +01:00
155ddec1f4
Removes Mining Drill from voucher choices
...
- Removed mining drill from voucher choices
- Minor oversight fixed in rechargers.
2015-05-08 11:53:48 -05:00
24bc259d24
Fixes a runtime with headcrabs controled by non changeling players.
2015-05-08 17:56:59 +02:00
90724e6306
Adds resize variable for mobs
2015-05-08 17:28:19 +02:00
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
489d076de5
Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
...
Fixes #9035 , atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
b5bbc6f1ef
Fixes aliens getting an exhaustion message.
...
Fixes nearly infinite loop when calling setStaminaLoss -> CHeckStamina -> SetStaminaLoss -> etc...
CheckStamina is now called in carbon/handle_status_effects instead of carbon/handle_regular_status_updates().
2015-05-08 15:37:40 +02:00
2febf4dacd
Merge pull request #9293 from xxalpha/cable_color
...
Engineering Cyborgs can now change their cable coil color.
2015-05-08 22:10:58 +10:00
f16c21e99f
Merge pull request #9252 from RemieRichards/MapGeneratorImprovements
...
Procedural Map Generator Improvements [Perfect for Merging/Porting]
2015-05-08 22:10:17 +10:00
e72a4fb580
Drop-Everything deletes NODROP items
2015-05-08 18:40:23 +10:00
0632b04eb4
fixes white crayons making nitrile gloves
2015-05-08 18:20:43 +10:00
1fb8dcecd1
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-07 15:44:17 +02:00
9e863a46d8
Merge pull request #9373 from AnturK/bunny_sterilization
...
Fixes leftover easter rabbit event
2015-05-07 07:54:35 -05:00
c8ea983267
More
2015-05-07 11:20:14 +12:00
98fedd31c7
Fix
2015-05-07 11:13:40 +12:00
45f2336413
Fixes the mining borg diamond drill upgrade
...
- Made the borg diamond drill upgrade a child of the standard borg
mining drill.
2015-05-06 10:09:57 -05:00
f85b3735bd
group of fixes
2015-05-07 00:40:26 +10:00
e91300f07d
Merge pull request #9168 from Ikarrus/SMES_boost
...
[MAP] Doubles Initial Engineering SMES charge
2015-05-06 09:28:04 -05:00
95d7af4e48
Merge pull request #9277 from Ikarrus/ertbaton
...
Batons for Light ERP
2015-05-06 09:03:55 -05:00
f49fbf1efc
Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
...
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
09c3c2cdc1
Merge pull request #9321 from KorPhaeron/master
...
Slime Mutation Changes +new reactions
2015-05-05 22:12:51 -05:00
daa9a92998
Update slime.dm
...
Fixed mutator used to be boolean
2015-05-05 21:50:22 -05:00
91be614fa5
More changes
...
Based on Remie's suggestions
2015-05-05 21:49:49 -05:00
a48374e3a5
Merge pull request #9333 from Dorsisdwarf/fixesbug-goofball
...
Fixes #9222 Dead monkies still scream when patches applied
2015-05-05 21:43:42 -05:00
867f283d85
Merge pull request #9330 from Jordie0608/whenpushcomestoshoveruntimeswilloccur
...
Fixes #693 , non-humans pushing restrained mobs
2015-05-05 21:11:58 -05:00
20181c37b8
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-05 17:55:32 -07:00
2c7ca4236c
New Posibrain enter method
...
- Positronic Brains are now activated in the same manner as drones -
click the item to enter it.
2015-05-05 16:41:55 -05:00
e2b2ce91e6
Message_Admin() and Game_Log() added
2015-05-05 20:34:25 +02:00
c0c2c8b097
cleanable #define
2015-05-05 18:51:44 +02:00
Jordie