Commit Graph

381 Commits

Author SHA1 Message Date
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
c0
0e1ae09e92 Plant Refactor: Revenge of the Grown 2016-03-02 07:30:06 +03:00
c0
23f1123b9a Name burgers are back! 2016-02-26 15:31:54 +03:00
Firecage
c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00
tkdrg
1a7cbda99f Merge pull request #15253 from bgobandit/cravenoaf
Adds shots of wine, blood and liquid gibs.
2016-02-07 23:02:46 -03:00
bgobandit
cca610f1e4 Adds shots of wine and other things. 2016-02-06 20:54:09 -05:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
phil235
81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
3f5f833013 Fix pizzabomb icon bug 2016-01-23 18:56:35 -06:00
Bjorn Neergaard
b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard
09571bd45f Allow custom pizzas in pizza boxes
Also fix boxes icons being wrong after surviving an explosion
2016-01-22 19:22:12 -06:00
Bjorn Neergaard
99e5764719 Refactor pizza_bomb, tweak pizza_bomb sprites
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites

Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Buggy123
157af1d006 Broken bottles are now the same size as unbroken bottles. 2016-01-15 22:14:18 -05:00
phil235
e225fbc850 - Refactor the visible_message() proc to be much faster.
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
2016-01-04 22:49:27 +01:00
Cheridan
44546d351e Merge pull request #14219 from KorPhaeron/bottle
Fixes bottles doing no damage when thrown
2016-01-02 16:14:00 -06:00
Buggy123
e95883ed89 Update drinks.dm 2015-12-31 20:41:44 -05:00
KorPhaeron
72da5f23e4 Bottle 2015-12-31 17:23:16 -06:00
KorPhaeron
1fdfb5b270 Fixes the loop for real this time 2015-12-24 06:15:58 -06:00
KorPhaeron
a1dad4e445 Remie loop 2015-12-24 05:01:57 -06:00
KorPhaeron
71d8a929a4 My stealth buff was defeated by code review 2015-12-21 09:08:26 -06:00
KorPhaeron
e988bc0a2a Slimes 2015-12-21 06:42:44 -06:00
bgobandit
a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag
Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme
2015-12-17 20:12:32 -05:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Incoming
a5aa452c2b I fudged it 2015-12-10 22:22:22 -05:00
bgobandit
49d54f48f7 Adds the severing of lizard tails. 2015-12-10 18:58:37 -05:00
Razharas
02fe4ec5a8 Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
2015-12-06 19:52:06 +03:00
MrStonedOne
9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
Razharas
41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
2015-12-05 01:14:20 +03:00
Cheridan
f634890457 Merge pull request #13335 from Incoming5643/fudge_dice
Fudge dice
2015-12-02 16:40:25 -06:00
kingofkosmos
ee522d61d7 Merge branch 'master' of https://github.com/tgstation/-tg-station into fewinhandsprites 2015-12-02 06:05:40 +02:00
swankcookie
3e5e9086c0 fix 2015-12-01 21:52:35 -06:00
Incoming
0c1d7272d5 Adds fudge dice
They're six sided dice with two pluses, two minusii, and two blank sides.

They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.

Adds them to the "rare dice" spawn in dice bags.

Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.

Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
kingofkosmos
edb611f53d Adds in-hand sprites for tracking beacon, pizza box and carp plushie. 2015-11-29 16:43:52 +02:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
phil235
5e43d2b570 Merge pull request #12924 from Firecage/Optable
Changes the operating table to be an actual table.
2015-11-11 17:31:38 +01:00
Firecage
9ce5334890 merge conflict fix 2015-11-10 18:44:10 +02:00
MrStonedOne
88eef20b69 Fixes smartfridges once and for all. 2015-11-09 14:35:16 -08:00
phil235
6c99bf6e71 Remove some debug message in smartfridge code. 2015-11-08 21:40:41 +01:00
Firecage
b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
blah
ea4bdc9ad7 Fixes the smartfridge.dm properly 2015-11-06 20:24:40 +00:00
blah
e9e0f452dd Fixes the smartfridge.dm 2015-11-04 17:45:29 +00:00
blah
e563c0b47e Quick merge before complete do not send this to main repo yet 2015-11-04 16:41:17 +00:00
KorPhaeron
53cdf169e1 Xenobio control 2015-10-30 03:53:18 -05:00
Razharas
ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00