Commit Graph

361 Commits

Author SHA1 Message Date
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
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
Cheridan
d7eca4f327 Merge pull request #11340 from phil235/CoinFlipThrowFix
Fixes the do_after progress bar appearing on a coin when flipping+throwing it
2015-08-27 01:00:01 -05: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
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
c0
9cfb246e4f Removes dirt from walking on tiles 2015-08-24 11:33:52 +03:00
phil235
90f54ba95c Fixes the do_after progress bar appearing on a coin when flipping+throwing it. 2015-08-23 19:34:09 +02:00
Remie Richards
271b7344f5 Merge pull request #11045 from KorPhaeron/survivalpod
Survivalpod
2015-08-18 20:50:18 +01:00
KorPhaeron
fece9cf524 I forgot how my own code worked 2015-08-16 10:49:51 -05:00
KorPhaeron
dcee74e952 Fixed the src.loc stuff 2015-08-15 21:41:19 -05:00
Cheridan
5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
c0
691f6fb66d Surgery & Organs Rework: Phase 2 2015-08-06 09:56:54 +03:00
KorPhaeron
109cbe7280 Survival Pod 2015-08-05 16:18:14 -05:00
Jordie
9bc07812e1 Merge pull request #10967 from astralenigma/digfix
Digging gets the same progress bar as minning.
2015-08-05 14:35:39 +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
Rui Neves Carvalho
91e3ee3658 Everybody hates my code. 2015-08-02 16:42:07 +01:00
Rui Neves Carvalho
738b72702b Phil hates semi-colons and parenthesis and has supreme god bug fixer he requires sacrifices. 2015-08-01 20:32:46 +01:00
Rui Neves Carvalho
d686ad3a69 Corrected the copypasta by Phil's wise specifications. 2015-08-01 18:02:32 +01:00
Rui Neves Carvalho
4c0d685d6f Revert "Added L"
This reverts commit d0c0760653.
2015-08-01 17:42:19 +01:00
Rui Neves Carvalho
d0c0760653 Added L 2015-08-01 17:41:57 +01:00
Rui Neves Carvalho
f0ebee0467 Digging gets the same progress bar as minning.
Fixes #10854
2015-08-01 08:18:33 +01:00
c0
04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03: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
AnturK
198758e52d Feedback 2015-07-26 20:11:03 +02:00
AnturK
fa35ae91d7 Allows aliens to mine 2015-07-26 20:01:52 +02:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
phil235
ea1780ce97 - Mech equipment was using its unique processing method, with specific timing for each equipment, but now it uses obj processing, I
changed the values so the equipment effect stays the same. Remove global_iterator datum.
- fiddled with equip_ready procs of mech tools.
- removed mecha/proc/do_after and /enter_after() procs.
- Renamed mech sleeper occupant var to "patient" to avoid confusion with the occupant of the mech.
- all non instant tool (drill) now show a progbar when drilling etc..
- action cooldown now use do_after_cooldown() (that itself uses do_after) and start_cooldown (for instantaneous actions).
- Removed mecha_equipment's destroy proc, it's now all in Destroy(). No confusion.
- modified mecha_equipment/proc/can_attach() to not check istype(mecha) b/c it can't not be. (so the child only have one istype check.
- Removed diamonddrill/can_attach() , all done at drill level.
- armor booster now only for combat mech, instead of all except honkmech.
- Removed dynhitby, dynbulletdamage, dynattackby, dynusepower(), dyngetcharge(), dynabsorbdamage()
- I split the tools.dm file into smaller ones: work tools, mining tools, other tools.
- I split mecha.dm into mecha.dm, mecha_topic.dm and mecha_defense.dm
- refactored mech weapon ballistic/launcher, new proj_init proc, more OOP.
- Moving consumes energy! Lights consumes energy. Fixes #9425.
- Fixed #7354 xeno not bursting if host is inside a mech.
- Added action buttons to mech. Moved toggle lights, internal tank, eject, view stats from verbs to action buttons, these can now only

be done via these buttons (removed them from the big stats window).
- Removed port connect verbs b/C it's automated now.
- regular hud is no longer hidden when inside a mech (doesn't matter b/c you can't interact with most stuff in it while in a mecha). Fixes issue 10387
- can't walk when shooting projectiles. Makes walking on your projectile a bit harder. Helps against issue 10315 (but doesn't fix it).
- also made into action buttons: the special abilities of certain combat mechs.
- Added thrown alerts for mech charge and integrity.
- Fixes teleporting occupant out not properly removing it from the mech. Fixes issue 10330
- fixes ballistic mech weapons spinning when launched. proc/throw_at() now has a spin argument instead of using var/allow_spin that was added to all atoms just for that.
- added a update_action_buttons() to ai/life() to handle ai mech.
2015-07-07 19:40:32 +02:00
Razharas
6fad4d1df8 Merge pull request #10271 from Cheridan/red_faction
Removes Access Restriction on Mining Shuttle Console
2015-07-05 00:21:58 +03:00
Cheridan
c9c2e90acb Merge pull request #10268 from GunHog/Ore_ID
Ore Redemption Machine ID improvement
2015-07-04 12:10:56 -05: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
Cheridan
a883997fdc Removes Access Restriction on Mining Shuttle Console 2015-06-29 15:28:36 -05:00
GunHog
360256e070 Ore Redemption Machine ID improvement
- The Ore Redemption Machine now releases minerals to authorized users
without the need for an inserted ID.
2015-06-29 12:53:45 -05:00
Ikarrus
8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
Ikarrus
6cc17a6243 Resolved Conflicts:
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
MrStonedOne
f06abf3e2f fixes compile error
One pr added a path to an item(#10018) but another pr changed that path(#9932).
2015-06-26 16:06:37 -07:00
phil235
ee13658752 Merge pull request #10018 from pudl/sam
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05:00
pudl
c2087e8cea fix according to miauw 2015-06-18 12:02:05 -05:00
pudl
62b2b87307 buffed explosion, removed message 2015-06-18 08:41:50 -05:00
pudl
8a8dde0f73 whoops 2015-06-18 04:56:09 -05:00
pudl
a7b9c7d9c9 user.incapacitated and other player requests 2015-06-18 03:22:59 -05:00
xxalpha
ab103b54dc Righted some checks.
If newcolor
2015-06-17 21:03:11 +01:00
pudl
58b436fe1f adds abandoned crates to code, adds crate spawners to code, distributes crate spawners across maps 2015-06-17 09:07:28 -05:00
Jordie0608
0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
Conflicts:
	code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00