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
Cheridan
da60a351bd
Merge pull request #11493 from Aranclanos/camerabugloop
...
Fixes an infinite loop with camera bugs.
2015-08-31 22:38:02 -05: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
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
Cheridan
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +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
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
1e57cc6845
fixes ellipsis
2015-08-28 14:22:29 -04: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
0979cb6499
Merge remote-tracking branch 'upstream/master' into airlockQDEL
2015-08-27 18:44:06 +01: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
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
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
Cheridan
ba1a268305
Merge pull request #11338 from phil235/BodyBagTagSpriteFix
...
Fixes bodybag not visually opening or closing.
2015-08-24 15:07:41 -05:00
Supermichael777
909658f240
Update buckling.dm
2015-08-24 14:20:31 -04:00
phil235
c275c9c948
Merge pull request #11300 from Supermichael777/Supermichael777-Barsigns
...
Updates the barsigns!
2015-08-24 13:58:42 +02:00
c0
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
phil235
7b2262e729
Fixes bodybag not visually opening or closing.
2015-08-23 18:14:40 +02:00
Aranclanos
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
Aranclanos
6f4c89c5ff
Fixes the nuclear disk from not spawning under really specific circumstances
2015-08-21 05:22:20 -03:00
Supermichael777
e0c6c710c2
Update barsigns.dm
2015-08-20 20:08:23 -04:00
Supermichael777
6fe5f23e55
Updates dank memes.
...
updates Bar memes to reflect recent rule changes/be funny.
2015-08-20 15:06:42 -04:00
Swag McYolosteinen
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
Jordie
bdd6a75382
Merge pull request #11119 from phil235/VaporizeMethodReaction
...
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
Jordie
a433f43b05
Merge pull request #11261 from Memendia/master
...
C4 text fix
2015-08-19 18:58:31 +10:00
Remie Richards
f2cf448d4e
Merge pull request #11245 from Aranclanos/alienfacehuggerhud
...
Fixes the alien hud icon for infected people not appearing.
2015-08-18 20:39:33 +01:00
Remie Richards
f26874a654
Merge pull request #11230 from SconesC/defib-c
...
Adds some clarity to a defib message when confronted with extreme tissue damage
2015-08-18 20:31:50 +01:00
Remie Richards
3c46b36cc4
Merge pull request #11218 from duncathan/ihatethisfilesomuch
...
Cleaning up construction.dm; very minor change to RPD
2015-08-18 20:29:51 +01:00
Remie Richards
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
Remie Richards
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
