Commit Graph

1083 Commits

Author SHA1 Message Date
tkdrg
180bd6de79 Merge pull request #15588 from AnturK/isbuffingthisactuallygoodidea
Fixes tesla southern tendency.
2016-02-18 18:35:26 -03:00
AnturK
56d2a34201 Splits beds and chairs
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
AnturK
422b55d2f9 Fixes tesla southern tendency. 2016-02-17 22:52:10 +01:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
Kyle Spier-Swenson
7dc5c2b684 Fixes the tesla going nuts if deleted at the wrong moment. 2016-02-12 18:49:38 -08:00
tkdrg
fa287ee090 Merge pull request #15146 from Buggy123/patch-13
Adds cable coils to autolathe
2016-02-12 21:39:40 -03:00
Buggy123
5788e89ffa Added cable coils to the autolathe
Cable coils will only be built in stacks of 30, at maximum.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Fixed it not compiling?

Finally got it to compile

Fixes bad code

removed unnecessary /var

Added maxstack var to define custom stack sizes for things

Allowed the autolathe to use custom stack sizes.

Adds correct maxstack values to various stackable objects
2016-02-12 18:17:34 -05:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
Razharas
4e84fc7fe9 Merge pull request #15338 from tkdrg/whoa
[s]Fixes server crash by abusing containment fields
2016-02-11 04:23:46 +03:00
AnturK
b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130
[Ready]Tesla balance and code cleanup
2016-02-10 11:36:32 +01:00
Bjorn Neergaard
5975449a31 Fix gravity gen logging during init 2016-02-09 23:45:02 -06:00
Bjorn Neergaard
cbd37b6e77 Fix gravity generator runtime
Checking turf Z is silly when mob checks make more sense

The following runtime has occured 53 time(s).
runtime error: Cannot read null.z
proc name: shake everyone (/obj/machinery/gravity_generator/main/proc/shake_everyone)
  source file: gravitygenerator.dm,360
  usr: null
  src: the gravitational generator (/obj/machinery/gravity_generator/main/station)
2016-02-09 23:04:58 -06:00
Tkdrg
ae1c4c3007 Fixes server crash by abusing containment fields 2016-02-08 21:08:45 -03:00
MrStonedOne
60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
2016-02-07 17:41:42 -08:00
MrStonedOne
eef4f4d534 Optimizes tesla_zap, adds fuel tank tesla_act, misc tesla changes 2016-02-07 17:34:52 -08:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard
c5e6a922ca Cache canister updates and make huge scrubbers use power; add movable version 2016-02-05 17:06:03 -06:00
xxalpha
68dedb9ee2 Reverts #15187 2016-02-05 01:28:44 +00:00
xxalpha
3316070ac0 Merge remote-tracking branch 'upstream/master' into putin 2016-02-05 01:27:26 +00: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
xxalpha
cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00
KorPhaeron
8d4351fd04 Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue" 2016-02-03 22:03:22 -06: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
xxalpha
9154e6cbf2 ultra range again 2016-02-03 07:58:41 +00:00
Razharas
6dd29e1211 Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
2016-02-02 01:02:17 +03:00
tkdrg
a0f7d7afe1 Merge pull request #14999 from KorPhaeron/AI_buffs
AI upgrade software
2016-01-30 10:50:05 -03:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
Bjorn Neergaard
f93822c195 Allow tgui input() to be 0, fix SMES components
Fixes #14965
2016-01-28 07:10:37 -06:00
KorPhaeron
00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
d9162b653c Fix tgui recursion being broken
..() is more elegant after all... You win @RemieRichards
Fixes #14925
2016-01-27 00:52:22 -06:00
Kyle Spier-Swenson
22d408fd4b readds type checking to get_cloest_atom as apparently there are plans for that 2016-01-26 22:17:24 -08:00
Kyle Spier-Swenson
dd48ad1650 Cleans up tesla code 2016-01-26 22:08:47 -08:00
Razharas
d110b5fc59 Merge pull request #14882 from ChangelingRain/superfailed
Actually fixes supermatter explosion to not be capped
2016-01-27 04:16:20 +03:00
Kyle Spier-Swenson
b872a53893 Tesla now favors moving in the direction of what it last zapped 2016-01-25 23:16:24 -08:00
Kyle Spier-Swenson
8877b68999 Coils now use the new faster way of processing a tesla zap 2016-01-25 20:03:20 -08:00
Kyle Spier-Swenson
8db54da28f lowers energy drain once more. 2016-01-25 19:38:39 -08:00
Bjorn Neergaard
961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Bjorn Neergaard
c78e1ec2ac Fix a lot of wire interactions 2016-01-25 12:03:03 -06:00
Nerd Lord
8131d9e5b1 i forgot what to set the var to between looking at the proc and looking back at supermatter 2016-01-24 22:33:16 -05:00
Kyle Spier-Swenson
9961966ab4 tweaks energy loss 2016-01-24 13:13:25 -08:00
tkdrg
dc0e8f7b5c Merge pull request #14817 from duncathan/lastmos
Adds mapping freedom to the TEG
2016-01-24 15:15:48 -03:00
duncathan salt
14befdc1e8 Merge pull request #14807 from Razharas/UltimateFix
For real fixes smeses charge on construction
2016-01-24 10:07:00 -06:00
Razharas
b9eacbaf4a Merge pull request #14794 from ChangelingRain/superbombing
Fixes supermatter explosion being capped
2016-01-24 16:54:40 +03:00
duncathan
143352e506 fucking birdboat 2016-01-23 13:14:07 -06:00
duncathan
07bb3775e6 adds mapping freedom to the TEG 2016-01-23 12:25:42 -06:00
Razharas
d6ddcf6b4c For real fixes smeses charge on construction
For real fixes smeses charge on construction
Fixes https://github.com/tgstation/-tg-station/issues/14806
2016-01-23 18:17:01 +03:00