Commit Graph

215 Commits

Author SHA1 Message Date
Razharas
78416379dd Merge pull request #12484 from RemieRichards/Nyehhehheh
Allows Species to set custom say spans.
2015-10-19 21:45:03 +03:00
Remie Richards
ec3be464f3 Allows Species to set custom say spans. 2015-10-18 17:17:27 +01:00
phil235
a7bc8475d8 Fixes winter coat hood sprite appearing as a bucket.
Removing Smile, Swedish, Chav and Elvis from genetics. These mutation can still be acquired via adminspawned dna injector. Added a dna injector for laser eyes mutation.
Fixes using razor on non human shaving non existent hair.
Fixes chair deconstruction dropping too much metal.
Adding some necessary check for mob buckling in gibber, processor and monkey recycler code, and in ventcrawling proc to fix being able to enter pipe while feeding as a slime.
Fixes snapcorn not giving seeds.
Fixes portable chem dispenser.
2015-10-17 16:29:11 +02:00
Jordie0608
398a3ea1d1 unmagics polltypes into defines 2015-10-05 17:44:37 +11:00
Razharas
14d54d3ef2 Merge branch 'duncathan-hemanifolds' 2015-09-25 16:45:57 +03:00
Razharas
9d8cf0ffe9 Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds 2015-09-25 16:35:08 +03:00
Razharas
b9b8734b74 Merge pull request #11966 from MMMiracles/dwarfsman
Dwarfism
2015-09-25 12:18:52 +03:00
MMMiracles
1c130c03fe insert 'too-short' joke 2015-09-24 21:07:44 -04:00
xxalpha
deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
MMMiracles
3d43b8e389 dwarfdwarfdwarf 2015-09-23 18:13:16 -04:00
phil235
f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
Remie Richards
7b6bbbfed1 Further tweaks. 2015-09-13 16:17:50 +01:00
Remie Richards
4bb97067b2 Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints 2015-09-13 15:36:56 +01:00
xxalpha
a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes
Conflicts:
	code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
Razharas
9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints
Bloody footprints!
2015-09-07 16:07:03 +03:00
duncathan
3e4299105d adds heat exchanging manifolds, both 3-way and 4-way 2015-09-06 15:06:59 -06:00
Razharas
889643deae Merge pull request #11564 from Jordie0608/thisbranchnameisalie
Config announce admin login/out
2015-09-06 06:40:15 +03:00
Jordie0608
b7754d5ed7 announce login message as a config 2015-09-04 21:49:09 +10:00
Remie Richards
ff07337841 Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too. 2015-09-02 01:32:02 +01:00
xxalpha
4ead972306 Drying agent. Recolor dry shoes
use define
2015-09-01 22:59:30 +01: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
duncathan
2cc7226ea8 adds ways to check references while qdel'ing; removes redundant compile option 2015-08-29 03:27:55 -06: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
duncathan
cead1653c0 changes associative lists to standard lists; updates MiniStation.dmm 2015-08-17 21:46:39 -06:00
duncathan
e84ca7365a fixes merge stuff 2015-08-17 16:48:34 -06:00
duncathan
fb824b7c1c Merge branch 'ihatethisfilesomuch' into pipecleanup
Conflicts:
	code/ATMOSPHERICS/pipes/he_pipes.dm
	code/game/machinery/pipe/construction.dm
2015-08-17 16:23:55 -06:00
duncathan
99234185de first pass of cleanup
makes simple pipes more OOP
adjusts defines; puts them in __DEFINES/atmospherics.dm
adds DEVICE_TYPE_LOOP define, which is used in a bunch of the for loops
2015-08-16 23:10:57 -06:00
duncathan
d320c4c945 first pass of cleaning up construction.dm + merge from upstream 2015-08-14 20:55:09 -06:00
Jordie
63c545346d Merge pull request #10992 from RemieRichards/AlternateWornLayer
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
Jordie
d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
c0
667d5e75c3 Transferred body eggs to new organs system 2015-08-03 23:24:17 +03:00
Remie Richards
47fe31346e Adds alternate_worn_layer, like alternate_worn_icon it allows an item to slightly bend the rules of worn item rendering, DOES NOT MODIFY THE STANDING_ICONS INDEXES, BECAUSE THAT WOULD BREAK THINGS 2015-08-02 22:45:18 +01:00
phil235
1f9143c224 Move hostile animal target into the life subproc handle_automated_action().
Renaming AI_SLEEP to AI_IDLE.
Removing debug messages.
2015-07-30 22:49:26 +02:00
phil235
357c595176 Changes the targeting code for hostile animals to be a bit more efficient. AIStatus and stance vars are now only one var. The idle stance is fused with the AI_SLEEP status. hostile/life() now only calls ListTargets() once per cycle (we save a list of targets then use that instead of calling the proc again).
Alien animals no longer plant egg/weed when player controlled (even if disconnected).
Created the the proc handle_automated_action() for simple_animals , currently only used by giant spiders and alien animals.

Player controlled hostile animals no longer starts targetting things again when the player disconnects.
2015-07-30 22:26:07 +02:00
Remie Richards
0aa39c207a Adds 3 helper procs for working with the direction atoms face. Uses one to improve check_target_facings(). check_target_facings() now returns defines instead of magic numbers. 2015-07-21 10:07:05 +01:00
phil235
94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
phil235
9eced1ac5b Fixes thrown closet opening to not use spawn().
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
2015-07-19 21:29:35 +02:00
MrStonedOne
73c2635e5d Tweaks some atmos defines relating to spreading and plasma
Makes plasma show up as an overlay more easily, and makes linda less aggressive about sleeping active turfs.
2015-07-13 07:17:38 -07:00
Razharas
60a5a83757 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix 2015-07-04 22:31:18 +03:00
Razharas
38c2a54d9d Replaces magic number with define
Replaces magic number with define
2015-07-04 22:30:46 +03:00
Cheridan
798f05e4a6 Merge pull request #10272 from Razharas/DarkClick
Fixes clicks in darkness
2015-07-04 12:17:10 -05:00
Cheridan
7b6867bc21 Merge pull request #10328 from Ikarrus/datumgangs
Datum-Based Gangs [Ready]
2015-07-03 10:35:07 -05:00
Swag McYolosteinen
d7289fd34e Merge pull request #10254 from AlexanderUlanH/saltyseclites
Shadowling Update 2: 121% Merge-Ready
2015-07-03 10:55:32 +02:00
Razharas
b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
Ikarrus
25b134581b Resolved Conflicts:
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
Ikarrus
2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06:00
xxalpha
4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
WJohn
cf921dec58 Merge pull request #10163 from RemieRichards/TableCraftingUnFucking
Table Crafting Update
2015-07-01 14:29:55 -04:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Razharas
1b793f89c8 Merge branch 'master' of https://github.com/tgstation/-tg-station into DarkClick
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/client/client defines.dm

Fixes conflicts
2015-06-29 23:15:06 +03:00