Razharas
e18032c87a
Merge pull request #11411 from Xhuis/help_xenos_in_medbay_maint
...
MEGA Toys presents: Xenos Isolated action figure!
2015-09-01 09:58:15 +03:00
Razharas
40bdd7e1eb
Merge pull request #11488 from bgobandit/smeslogging
...
Adds fingerprint transfer for machine deconstruction; logs SMES
2015-09-01 09:50:57 +03:00
Cheridan
da60a351bd
Merge pull request #11493 from Aranclanos/camerabugloop
...
Fixes an infinite loop with camera bugs.
2015-08-31 22:38:02 -05:00
Swag McYolosteinen
c94540ee7e
Merge pull request #11486 from spasticVerbalizer/yellRuntime
...
Fixes empty message because of yelling
2015-08-31 12:32:30 +02:00
xxalpha
3f29a9866c
Merge remote-tracking branch 'upstream/master' into qdelFixes
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-08-31 08:52:30 +01:00
Razharas
608f216b40
Merge pull request #11469 from Cheridan/crushed_it
...
Recycler Tweak Port
2015-08-31 10:07:31 +03:00
Aranclanos
1abeb952a4
Fixes an infinite loop with camera bugs.
2015-08-30 19:43:27 -03:00
Razharas
d1c417e996
Merge pull request #11416 from xxalpha/airlockQDEL
...
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
bgobandit
504f2b7270
Adds fingerprint transfer for machine deconstruction and logging for SMES in particular.
2015-08-30 14:58:21 -04:00
Cheridan
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
Maarten van den Berg
71cb5627c3
no wait that's dumb
2015-08-30 18:55:58 +02:00
c0
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
Jordie
f26a67348d
Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner
...
Some swarmer issue fixes
2015-08-30 17:51:57 +10:00
Cheridan
9eddb7d2f0
Merge pull request #11456 from bgobandit/canistertext
...
Adds descs to canisters. Alters plasma canister name.
2015-08-30 01:10:26 -05:00
Aranclanos
617d81c9a6
Fixes the changeling transformation sting, it wasn't working at all.
2015-08-29 22:33:57 -03:00
Cheridan
7a469e240a
Merge pull request #11437 from bgobandit/dronepax
...
Refactors medical stacks used on simple animals.
2015-08-29 18:55:27 -05:00
Cheridan
c4a1b0ebdb
Recycler Tweak Port
2015-08-29 17:47:42 -05:00
Ergovisavi
49ce1d65db
-Fixes #11448
...
-Fixes #11443
Swarmer related issues
Also adds feedback to where unactivated swarmers spawn, and if someone took one before you
Fixes the automated announcement system not qdel()-ing properly
2015-08-29 14:45:28 -07:00
xxalpha
3379cb8145
Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly.
2015-08-29 19:24:36 +01:00
Cheridan
87eae12f89
Merge pull request #11425 from bgobandit/golemsandglass
...
Golems no longer take damage from attacking with glass shards.
2015-08-29 11:17:34 -05:00
bgobandit
5b528c2b7f
Adds descs to canisters. Alters plasma canister name.
2015-08-28 22:48:33 -04:00
bgobandit
1e57cc6845
fixes ellipsis
2015-08-28 14:22:29 -04:00
c0
4374c96117
Fixes
2015-08-28 10:44:34 +03:00
bgobandit
607170a9ef
g merge conflicts. remote-tracking branch 'upstream/master' into dronepax
...
Conflicts:
code/modules/mob/living/simple_animal/revenant/revenant.dm
code/modules/mob/living/simple_animal/slaughter/slaughter.dm
2015-08-28 02:54:43 -04:00
bgobandit
6f6744da33
Refactors healing simple animals with bruise packs.
2015-08-28 02:02:43 -04:00
Cheridan
d824f7b35f
Merge pull request #11382 from Ergovisavi/bot_swarm
...
Adds "Swarmers" - Simple mob side antagonist
2015-08-28 00:21:23 -05:00
Ergovisavi
3737234b9c
-Adds swarmer as a language, makes them only able to speak to each other
...
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
2015-08-27 22:10:30 -07:00
Cheridan
7f0f74f100
Merge pull request #11380 from bgobandit/salicyclicassblastusa
...
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
bgobandit
326d849836
You can no longer use bruise packs, ointment or other medical stack items on drones.
2015-08-28 00:51:24 -04:00
c0
14bd455287
Button frame added to metal
2015-08-28 02:04:33 +03:00
c0
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
bgobandit
1009c08ff4
Golems no longer take damage from attacking with glass shards.
2015-08-27 14:55:48 -04:00
xxalpha
ec0ccbaf40
Merged with recent change
2015-08-27 18:48:31 +01:00
xxalpha
0979cb6499
Merge remote-tracking branch 'upstream/master' into airlockQDEL
2015-08-27 18:44:06 +01:00
Cheridan
eebbed3a6b
Merge pull request #11405 from Aranclanos/floortilesfirst
...
Floor re-organization step 1
2015-08-27 12:10:40 -05:00
Cheridan
1769bc2f8d
Merge pull request #11104 from phil235/BuckleMulebot
...
Mob buckled to mulebots
2015-08-27 12:06:28 -05:00
xxalpha
b9db8ce854
A few qdel fixes.
2015-08-27 13:15:41 +01:00
xxalpha
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
Xhuis
0b25b9e3b8
Fixes oversight
2015-08-26 18:03:13 -04:00
Xhuis
8f7f540a3b
Fixes code errors
2015-08-26 17:39:59 -04:00
Xhuis
fdc060a015
Xenomorph action figure
2015-08-26 17:33:59 -04:00
Cheridan
3278a3926b
Merge pull request #11358 from phil235/XenoFeatures1
...
Facehugger inhands, xeno tweaks, and monkey bugfixes
2015-08-26 07:52:31 -05:00
Aranclanos
3749dcacb3
Creates type paths for all types of floors in floor.dmi, first step for the floor organization.
2015-08-26 06:47:27 -03:00
Aranclanos
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
Cheridan
4f1a3dfc6e
Merge pull request #11376 from Supermichael777/Supermichael777-heatfix
...
Corrects the spelling of a buckling message.
2015-08-25 23:52:03 -05:00
phil235
67a7eb2d5f
Merge pull request #11277 from Jordie0608/beforecolortvalllistswereblackandwhite
...
Changes gold slime core hostile mob list to var
2015-08-25 20:03:13 +02:00
bgobandit
6ab2443255
Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog.
2015-08-25 13:46:05 -04:00
Ergovisavi
9572bd6aa6
-First revision of Swarmer mob, hud, icons, etc
...
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
2015-08-25 03:24:34 -07:00
bgobandit
132adf3f00
adds silver sulf syringes instead of kelotane pills
2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868
Fixes burn kits containing salicyclic acid pills.
2015-08-24 21:36:50 -04:00
