Commit Graph

6438 Commits

Author SHA1 Message Date
Razharas bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas 829a88816b Merge pull request #11179 from Dorsisdwarf/andtheyrelikeitsdeaderthanyours
Makes lings undetectable to the AI when using digital camo
2015-09-01 11:00:38 +03:00
Razharas 446e784017 Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor
Cyborgs unlocking cover and AI unanchoring upon dying.
2015-09-01 10:08:08 +03:00
Razharas cddb32f606 Merge pull request #11384 from Aranclanos/petemilking
Fixes goat and cow milking, they were just simply not working.
2015-09-01 10:02:27 +03:00
duncathan 48b67e5a25 Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
Conflicts:
	code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
xxalpha 4644e99aa7 Changed bloodcrawl to be a spell.
Changed blood crawl to be a spell.

BLOOOOD
2015-08-31 16:24:27 +01: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
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Cheridan 69fa21e66d Merge pull request #11472 from Aranclanos/larvatypo
REMOVES ALIEN LARVAS
2015-08-31 00:30:31 -05:00
Aranclanos d3b131a2ad Fixes ghost yelling, now the message will be displayed.
Same with binary chat, blob overmind and alien hivermind.
2015-08-30 19:14:30 -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
Maarten van den Berg 2a933dd0b3 Adds check for empty message in guardian communicate verbs 2015-08-30 16:28:35 +02: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
Aranclanos 0da6bf9430 Merge branch 'master' of https://github.com/tgstation/-tg-station into petemilking
Conflicts:
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
2015-08-29 23:14:57 -03:00
Aranclanos 537c823fa8 Removes an incorrect type path, mob/living/carbon/larva, unused. It was just a typo. 2015-08-29 22:48:20 -03:00
Cheridan 04869ad71d Merge pull request #11451 from Aranclanos/carbonreagents
Fixes alien larva breathing.
2015-08-29 20:02:29 -05: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
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
hornygranny 2367ae48c9 Revert "Smooth out gliding so movement isn't (as) jerky" 2015-08-29 13:37:55 -07:00
duncathan f7363fc737 Squashed commit of the following:
commit 5ab47a85f7
Author: duncathan <dunc2403@dunc2403.com>
Date:   Sat Aug 29 03:29:23 2015 -0600

    disables TESTING; it should not be enabled by default

commit 2cc7226ea8
Author: duncathan <dunc2403@dunc2403.com>
Date:   Sat Aug 29 03:27:55 2015 -0600

    adds ways to check references while qdel'ing; removes redundant compile option

commit 4409db7f0b
Author: duncathan <dunc2403@dunc2403.com>
Date:   Sat Aug 29 00:19:25 2015 -0600

    makes the game compile if TESTING is defined in compile options

commit e11befbbfa
Merge: 22ffbca 20ba307
Author: Cheridan <derpheim@yahoo.com>
Date:   Fri Aug 28 07:20:03 2015 -0500

    Merge pull request #11356 from Aranclanos/listnull

    Fixes the brand intelligence event not triggering the uprising under …

commit 22ffbca5a2
Author: sybil-tgstation13 <sybil@tgstation13.org>
Date:   Fri Aug 28 05:43:08 2015 +0000

    Automatic changelog compile

commit d824f7b35f
Merge: 7f0f74f 3737234
Author: Cheridan <derpheim@yahoo.com>
Date:   Fri Aug 28 00:21:23 2015 -0500

    Merge pull request #11382 from Ergovisavi/bot_swarm

    Adds "Swarmers" - Simple mob side antagonist

commit 3737234b9c
Merge: 9572bd6 ba1a268
Author: Ergovisavi <rtothev@gmail.com>
Date:   Tue Aug 25 05:48:37 2015 -0700

    -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.

commit 7f0f74f100
Merge: d8f8f89 6ab2443
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 23:53:58 2015 -0500

    Merge pull request #11380 from bgobandit/salicyclicassblastusa

    Fixes burn kits containing salicyclic acid pills. Adds new burn medication.

commit d8f8f89203
Merge: 68002be 460c2c2
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 23:46:57 2015 -0500

    Merge pull request #11386 from Aranclanos/rapiddupe

    Fixes the admin message not appearing under certain conditions when t…

commit 68002bed99
Merge: eebbed3 d27a736
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 16:50:33 2015 -0500

    Merge pull request #11315 from CorruptComputer/why

    Removes dmm2tgm from map merger

commit eebbed3a6b
Merge: 1769bc2 3749dca
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 12:10:40 2015 -0500

    Merge pull request #11405 from Aranclanos/floortilesfirst

    Floor re-organization step 1

commit 1769bc2f8d
Merge: d7eca4f 20023f7
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 12:06:28 2015 -0500

    Merge pull request #11104 from phil235/BuckleMulebot

    Mob buckled to mulebots

commit d7eca4f327
Merge: be6cc6a 90f54ba
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 01:00:01 2015 -0500

    Merge pull request #11340 from phil235/CoinFlipThrowFix

    Fixes the do_after progress bar appearing on a coin when flipping+throwing it

commit be6cc6adf9
Merge: 9c9bf4a d211992
Author: Cheridan <derpheim@yahoo.com>
Date:   Thu Aug 27 00:48:54 2015 -0500

    Merge pull request #11392 from phil235/SinguloCableNetRebuildFix

    An attempt to reduce singulo lag from power wires destruction. 2nd attempt.

commit 9c9bf4a858
Merge: 3278a39 6277a80
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Thu Aug 27 01:06:03 2015 -0300

    Merge pull request #11393 from Ergovisavi/has_wumbo_gone_too_far

    Fixes infinite wumbo-ing

commit 3278a3926b
Merge: 38e6a09 1f37141
Author: Cheridan <derpheim@yahoo.com>
Date:   Wed Aug 26 07:52:31 2015 -0500

    Merge pull request #11358 from phil235/XenoFeatures1

    Facehugger inhands, xeno tweaks, and monkey bugfixes

commit 3749dcacb3
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Aug 26 06:47:27 2015 -0300

    Creates type paths for all types of floors in floor.dmi, first step for the floor organization.

commit 38e6a09cf9
Merge: 4f1a3df 9cfb246
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Wed Aug 26 06:27:31 2015 -0300

    Merge pull request #11351 from Core0verload/nodirt

    Removes dirt from walking on tiles

commit 6277a80cdb
Author: Ergovisavi <rtothev@gmail.com>
Date:   Tue Aug 25 14:02:48 2015 -0700

    -Fixes infinite wumbo-ing

commit d211992ddc
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Tue Aug 25 20:22:30 2015 +0200

    Make it so the code doesn't rebuild (propagate_network()) the wire network X times when singulo/explosion destroys a line of X cables at once.

commit 6ab2443255
Author: bgobandit <bandit@mailinator.com>
Date:   Tue Aug 25 13:46:05 2015 -0400

    Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog.

commit 9572bd6aa6
Author: Ergovisavi <rtothev@gmail.com>
Date:   Tue Aug 25 03:24:34 2015 -0700

    -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

commit 460c2c290c
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Tue Aug 25 05:31:02 2015 -0300

    Fixes the admin message not appearing under certain conditions when the rapid dupe experimentator relic is used.
    All objects from said relic will spawn at the same time now.

commit 2c56462e97
Author: bgobandit <bandit@mailinator.com>
Date:   Mon Aug 24 22:45:37 2015 -0400

    I sure do love me some copypasta

commit 132adf3f00
Author: bgobandit <bandit@mailinator.com>
Date:   Mon Aug 24 21:45:18 2015 -0400

    adds silver sulf syringes instead of kelotane pills

commit ce8722b868
Author: bgobandit <bandit@mailinator.com>
Date:   Mon Aug 24 21:36:50 2015 -0400

    Fixes burn kits containing salicyclic acid pills.

commit 1f37141b8b
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon Aug 24 22:53:45 2015 +0200

    Alien humanoids and monkeys can now use "me".
    Alien hivemind chat now uses <span class='alien'> (dark purple). Also the alien queen name now appears bigger in the hivemind chat.

commit 5cecd7e9fe
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon Aug 24 19:54:51 2015 +0200

    Simplifies plasmavessel/on_life() a bit, and make xeno on weeds also heal clone damage.

commit cb1cd5b1e7
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Mon Aug 24 17:07:09 2015 +0200

    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

commit 20ba3071ed
Author: Aranclanos <aranclanos@hotmail.com>
Date:   Mon Aug 24 07:52:54 2015 -0300

    Fixes the brand intelligence event not triggering the uprising under certain conditions.
    Adds a new proc for the list helpers, removeNullsFromList() It does what it says.

commit 9cfb246e4f
Author: c0 <Core0verload@users.noreply.github.com>
Date:   Mon Aug 24 11:33:52 2015 +0300

    Removes dirt from walking on tiles

commit 20023f79d7
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sun Aug 23 21:39:22 2015 +0200

    Mobs buckled to mulebots now pass through plastic flaps.
    All ventcrawler and tiny sized mobs also pass through them now.

commit 27b7e3b6f6
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sun Aug 23 20:55:41 2015 +0200

    Beds no longer use this trick in Move() so neither should the mulebot.

commit 90f54ba95c
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sun Aug 23 19:34:09 2015 +0200

    Fixes the do_after progress bar appearing on a coin when flipping+throwing it.

commit d27a736f7e
Author: CorruptComputer <NGupton98@gmail.com>
Date:   Fri Aug 21 16:57:27 2015 -0500

    Fixes #11301

commit e16c03f010
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sat Aug 8 22:10:25 2015 +0200

    woops, now buckling succeeds if you are on the mulebot's turf.

commit 1c51550559
Author: phil235 <antoine_hernandez62@hotmail.fr>
Date:   Sat Aug 8 21:43:30 2015 +0200

    Changes how mulebots handle loading mobs. It now buckles them to the bot.

    You can no longer load objects containing mobs or with mobs buckled to them.

    You can no longer pass through plastic flaps by getting on a mulebot.

    Some simplification in mulebot code (buzzing sound code)

    Loading is now instantaneous and the mode BOT_LOADING is removed.

    The mulebot can no longer do certain stuff while off.

    Removing unneeded comments.

    Fixes mulebot loading/unloading being possible through border windows.

    Fixes mulebot not dropping its loaded cargo when qdel'd (wasn't a problem for explosion but for alien acid for example)
2015-08-29 13:19:15 -06:00
xxalpha 3379cb8145 Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly. 2015-08-29 19:24:36 +01:00
Cheridan a904c2a765 Merge pull request #11446 from AnturK/randomfixes
Armor Fix, Restrained SNPC fix
2015-08-29 13:13:49 -05:00
Swag McYolosteinen 137f0e0baf Merge pull request #11159 from MrPerson/smooth_gliding
Smooth out gliding so movement isn't (as) jerky
2015-08-29 17:56:40 +02:00
Aranclanos 3714bdf0d2 Fixes alien larva breathing.
Moves the create_reagets() to carbon New() instead of each subtype calling it by themselves.
2015-08-28 18:21:28 -03:00
AnturK 0e46800fd1 fixes snpc cuff pulling 2015-08-28 19:03:22 +02: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
xxalpha f8f5f689d9 Gave engineering cyborgs permanent magboots effect. 2015-08-27 20:23:35 +01:00
xxalpha 19947d4fa0 Added qdel(wires) to a bunch of objects Destroy proc.
Return ..()
2015-08-27 11:10:58 +01:00
Aranclanos 9c9bf4a858 Merge pull request #11393 from Ergovisavi/has_wumbo_gone_too_far
Fixes infinite wumbo-ing
2015-08-27 01:06:03 -03: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
Oisin100 cc45babcc7 Removed Comment 2015-08-26 11:38:53 +02:00
Aranclanos 38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
duncathan d9f816279b Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup 2015-08-26 00:24:22 -06:00
Ergovisavi 6277a80cdb -Fixes infinite wumbo-ing 2015-08-25 14:02:48 -07: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
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
Aranclanos 0d1d321651 Fixes pugs not following their tail.
The staff of change won't create invisible pugs anymore, same with the experimentator relics.
Removes a leftlover pug typepath.
2015-08-25 05:28:58 -03:00
Aranclanos 8a7c65817d Fixes goat and cow milking, they were just simply not working. 2015-08-25 04:24:59 -03:00
Oisin100 da2e11fd92 Update tree.dm 2015-08-25 00:22:16 +02:00
Oisin100 bf1bd69288 Tweaks
Removed comment giving Phil his credit.
2015-08-25 00:10:33 +02:00
Oisin100 e4506d01e9 Air Feature 2015-08-24 23:58:48 +02:00
phil235 1f37141b8b Alien humanoids and monkeys can now use "me".
Alien hivemind chat now uses <span class='alien'> (dark purple). Also the alien queen name now appears bigger in the hivemind chat.
2015-08-24 22:53:45 +02:00
phil235 5cecd7e9fe Simplifies plasmavessel/on_life() a bit, and make xeno on weeds also heal clone damage. 2015-08-24 19:54:51 +02:00
Oisin100 5eab46f136 Damn spaces. 2015-08-24 17:51:55 +02:00
Oisin100 6ff1fa0f9a Simplifications + Oxygen output corrected 2015-08-24 17:15:12 +02:00
phil235 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
Cheridan 227f8cf058 Merge pull request #11335 from phil235/DelToQdelBugFixes
Some bugfixes with qdel
2015-08-24 08:36:42 -05:00