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
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
f26a67348d
Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner
...
Some swarmer issue fixes
2015-08-30 17:51:57 +10:00
9eddb7d2f0
Merge pull request #11456 from bgobandit/canistertext
...
Adds descs to canisters. Alters plasma canister name.
2015-08-30 01:10:26 -05:00
617d81c9a6
Fixes the changeling transformation sting, it wasn't working at all.
2015-08-29 22:33:57 -03:00
7a469e240a
Merge pull request #11437 from bgobandit/dronepax
...
Refactors medical stacks used on simple animals.
2015-08-29 18:55:27 -05:00
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
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
5b528c2b7f
Adds descs to canisters. Alters plasma canister name.
2015-08-28 22:48:33 -04:00
1e57cc6845
fixes ellipsis
2015-08-28 14:22:29 -04:00
4374c96117
Fixes
2015-08-28 10:44:34 +03:00
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
6f6744da33
Refactors healing simple animals with bruise packs.
2015-08-28 02:02:43 -04:00
d824f7b35f
Merge pull request #11382 from Ergovisavi/bot_swarm
...
Adds "Swarmers" - Simple mob side antagonist
2015-08-28 00:21:23 -05:00
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
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
326d849836
You can no longer use bruise packs, ointment or other medical stack items on drones.
2015-08-28 00:51:24 -04:00
14bd455287
Button frame added to metal
2015-08-28 02:04:33 +03:00
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
1009c08ff4
Golems no longer take damage from attacking with glass shards.
2015-08-27 14:55:48 -04:00
ec0ccbaf40
Merged with recent change
2015-08-27 18:48:31 +01:00
0979cb6499
Merge remote-tracking branch 'upstream/master' into airlockQDEL
2015-08-27 18:44:06 +01:00
eebbed3a6b
Merge pull request #11405 from Aranclanos/floortilesfirst
...
Floor re-organization step 1
2015-08-27 12:10:40 -05:00
1769bc2f8d
Merge pull request #11104 from phil235/BuckleMulebot
...
Mob buckled to mulebots
2015-08-27 12:06:28 -05:00
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
3278a3926b
Merge pull request #11358 from phil235/XenoFeatures1
...
Facehugger inhands, xeno tweaks, and monkey bugfixes
2015-08-26 07:52:31 -05:00
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
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
4f1a3dfc6e
Merge pull request #11376 from Supermichael777/Supermichael777-heatfix
...
Corrects the spelling of a buckling message.
2015-08-25 23:52:03 -05:00
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
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
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
132adf3f00
adds silver sulf syringes instead of kelotane pills
2015-08-24 21:45:18 -04:00
ce8722b868
Fixes burn kits containing salicyclic acid pills.
2015-08-24 21:36:50 -04:00
ba1a268305
Merge pull request #11338 from phil235/BodyBagTagSpriteFix
...
Fixes bodybag not visually opening or closing.
2015-08-24 15:07:41 -05:00
909658f240
Update buckling.dm
2015-08-24 14:20:31 -04:00
cb1cd5b1e7
Monkey and aliens now all use carbon/examine().
...
Fixes monkeys being able to strip and uncuff people while handcuffed themselves.
Add an inhand sprite for facehuggers (taken from Xhuis) (but they don't appear for large queens, it'd look ugly).
Xenos now regenerate plasma on alien weed even when injured but at half the normal rate.
Moved queen/large/update_icons() to humanoid/update_icons.dm
2015-08-24 17:07:09 +02:00
c275c9c948
Merge pull request #11300 from Supermichael777/Supermichael777-Barsigns
...
Updates the barsigns!
2015-08-24 13:58:42 +02:00
8545a0fb48
Merge pull request #11322 from Aranclanos/hardsetdna
...
hardset dna fixes
2015-08-24 13:32:07 +02:00
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
b729565cdb
Merge pull request #11303 from Anonus/fuckthiscode
...
Brig door timers no longer automatically pixel-shift based on dir
2015-08-23 23:45:50 -05:00
20023f79d7
Mobs buckled to mulebots now pass through plastic flaps.
...
All ventcrawler and tiny sized mobs also pass through them now.
2015-08-23 21:39:22 +02:00
27b7e3b6f6
Beds no longer use this trick in Move() so neither should the mulebot.
2015-08-23 20:55:41 +02:00
7b2262e729
Fixes bodybag not visually opening or closing.
2015-08-23 18:14:40 +02:00
977ecfc5db
Fixes transfer_identity() sending the wrong argument for hardset_dna(), causing some errors.
2015-08-22 07:16:28 -03:00
8c26f4cb01
Merge branch 'master' of https://github.com/tgstation/-tg-station into beforecolortvalllistswereblackandwhite
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-08-22 16:55:13 +10:00
5824fedc17
gold core spawnable as var
2015-08-22 16:49:13 +10:00
dd6e735e71
The remove_from_storage() call from handle_atom_del() will stop dropping the objects on null, to avoid having other storage objects with items inside in a null location.
2015-08-21 07:14:56 -03:00
6f4c89c5ff
Fixes the nuclear disk from not spawning under really specific circumstances
2015-08-21 05:22:20 -03:00
Razharas