Commit Graph

1466 Commits

Author SHA1 Message Date
phil235
70a8046081 Merge pull request #10815 from bgobandit/bagtags
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
c0
2504affdcf Better sprites for bed and bedsheets 2015-08-04 15:39:28 +03: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
600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
phil235
0e91f254b9 Fixes a warning during compilation.
Removes some unneeded code lines.
2015-08-01 19:46:36 +02:00
phil235
3cb8df6e8d Merge pull request #10948 from SvartaSvansen/disintegrating-airlocks
Fixes disintegrating airlocks.
2015-08-01 17:24:21 +02:00
SvartaSvansen
e12d47aab6 Centcom airlock assemblies! No more disintegrating airlocks! 2015-07-31 01:41:02 -04:00
phil235
95be17923e Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
Orange Borg
04e74a4ffd Update girders.dm 2015-07-29 22:29:12 +12:00
Orange Borg
2eb50b644a Fixes small typo in girders.dm
Prevented borgs building a false wall

Fixes #10874
2015-07-29 13:22:48 +12:00
phil235
34b9a045fc Fixes non carbon being stunned when thrown and hitting something dense.
Fixes being able to enter a disposal bin while buckled.
Fixes items bouncing off delivery chute when thrown into it despite entering the chute.
Fixes being able to leave disposal pipes when moving inside pipes on a janicart.
Fixes some potential runtime (null loc) when flushing the disposal units.
Fixes the thrown range when being ejected from a disposal pipe.
2015-07-26 20:40:46 +02:00
Jordie
f5ae59a046 Merge pull request #10700 from Ergovisavi/more_fire
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
bgobandit
0d9f7dcb4a Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 11:58:52 -04:00
bgobandit
ab9668dd3d Moves update_icon(). Adds crayons. 2015-07-24 09:38:13 -04:00
bgobandit
2e88de4643 Merge branch 'master' of https://github.com/tgstation/-tg-station into bagtags 2015-07-24 02:17:10 -04:00
bgobandit
3ab197f80f Body bag sprites now update their tag overlay properly. 2015-07-23 20:20:55 -04:00
WJohn
1d48703c0e Merge pull request #10778 from bgobandit/babbysfirstcommitwhoawow
Fixes some spelling errors and tweaks some fluff text.
2015-07-23 19:45:47 -04:00
bgobandit
fcb081f0e1 (hopefully) fixes merge conflict, adds changelog entry 2015-07-23 11:22:49 -04:00
bgobandit
df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
Jordie
b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix
Handcuff, fire, overlays_standing fixes
2015-07-23 22:21:52 +10:00
bgobandit
d0eb72fd3a #whoa #wow 2015-07-22 14:58:58 -04:00
phil235
40967044cb Merge pull request #10707 from KorPhaeron/fixes
Fixes
2015-07-21 20:46:27 +02:00
KorPhaeron
d1dec3ffec Changed on phil's comments 2015-07-21 12:20:15 -05:00
Ergovisavi
e6a8511ac1 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:50:02 -07:00
Ergovisavi
5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00
phil235
76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
2015-07-20 22:37:06 +02:00
KorPhaeron
99c5d75cef Adds check for firer being null 2015-07-20 06:07:17 -05: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
KorPhaeron
65f56e146d Liberty Station fix, alien whispering fix, plasma statue logging.
Fixes the liberty station spawning an SMG without a firing pin by
creating an unrestricted variant of it. Added unrestricted L6 and
unrestricted bulldog object types for admin spawn since I was already
there.

Fixes aliens being able to whisper to ghosts.

Adds logging to shooting plasma statues.
2015-07-19 10:31:52 -05:00
Ergovisavi
bf83ef4c53 Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
2015-07-19 04:12:30 -07:00
Cheridan
a4a7c21744 Merge pull request #10653 from phil235/Fixarino
Three simple fixes again
2015-07-17 15:49:41 -05:00
Cheridan
41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix
Shower Fix
2015-07-17 15:34:29 -05:00
phil235
d72cbcaf2f - fixes handcuff overlay on monkey not showing.
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
2015-07-17 01:15:21 +02:00
phil235
7cd4a09ed7 Merge pull request #10592 from AlexanderUlanH/tables
Brings Tabling in line with newer stuns
2015-07-16 19:38:14 +02:00
phil235
9463dd7e70 Merge pull request #10613 from Ikarrus/rwindow-heat
Reinforced windows and windoors are a bit more resistant to fires and blasts
2015-07-16 18:42:45 +02:00
phil235
e968c9e03c Fixes dog bed dropping metal on deconstruction.
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
2015-07-16 13:04:44 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
5f7afb8782 Let's not spam people with drenching messages. 2015-07-15 20:08:53 +02:00
phil235
5a78777daf Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans.
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
2015-07-15 19:49:23 +02:00
Ikarrus
2bc5fd2db9 Reinforced windows and windoors are a bit more resistant to fires and blasts
- Regular windows/windoors: 1073k
- Reinforced windows/windoors: 1873k
- Reinforced windows/windoors will count as walls for blast range calculation (The lowest possible value)
2015-07-13 23:31:34 -06:00
phil235
b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
Alexander P. Ulan Hernandez
d7ee8b9032 Might as well fix this while there's a more controvercial PR 2015-07-13 08:51:37 -04:00
Swag McYolosteinen
81ec442d50 Merge pull request #10512 from duncathan/traygoggles
Adds t-ray scanner goggles for atmos techs
2015-07-12 12:41:37 +02:00
xxalpha
bd6ebcbd69 Fixed nest overlays being deleted when unbuckling a mob. 2015-07-11 02:20:50 +01:00
xxalpha
4b5659cbf2 what the fuck was I thinking with this one
Negative layers
2015-07-10 19:58:50 +01:00
xxalpha
1746e86ed8 Merge remote-tracking branch 'upstream/master' into smoothballs 2015-07-10 19:19:43 +01:00
Remie Richards
f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
duncathan
5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
xxalpha
942b4fd790 Fixed false walls incorrect icon update.
Enabled mineral false walls.
2015-07-09 17:17:24 +01:00