Commit Graph

2267 Commits

Author SHA1 Message Date
AnturK
e5bfff0cc9 Merge pull request #15393 from LanCartwright/needsallcures
Adds var/needs_all_cures
2016-02-13 19:07:19 +01:00
tkdrg
53002ec035 Merge pull request #15444 from Fox-McCloud/martial-fix
Fixes Sleeping Carp Grabbing
2016-02-13 00:13:09 -03:00
tkdrg
313f2e9b41 Merge pull request #15431 from ChangelingRain/punchstun
Fixes basic martial arts not checking the species punch stun threshold.
2016-02-12 14:37:14 -03:00
Fox-McCloud
d3a615acd4 Fixes Sleeping Carp Grabbing 2016-02-11 21:42:17 -05:00
Nerd Lord
26837bef6b Fixes basic martial arts not checking the species punch stun threshold. 2016-02-11 12:26:50 -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
Akke
8170f2113d if(!affected_mob.reagents.has_reagent(C_id)) 2016-02-10 22:50:31 +00:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
2016-02-10 22:35:19 +01:00
Akke
00eba3168d updates to dunc and kaze's suggestion 2016-02-10 18:21:20 +00:00
Akke
26c944b7e0 Adds var/needs_all_cures 2016-02-10 18:04:44 +00:00
Bjorn Neergaard
265b8d2d20 Fix an air alarm runtime
Don't store hard refs to an area which can cause race condtions
Instead, get our area only when we need it

The following runtime has occured 4426 time(s).
runtime error: Cannot read null.atmosalm
proc name: update icon (/obj/machinery/airalarm/update_icon)
  source file: airalarm.dm,535
  usr: null
  src: the alarm (/obj/machinery/airalarm)
2016-02-10 07:01:24 -06:00
Bjorn Neergaard
f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
phil235
83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard
ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard
ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -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
9386602acf tgui cargo console
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
tkdrg
7651557bdb Merge pull request #15196 from AnturK/wasteremoval
Removes unused debug datum
2016-02-05 14:57:33 -03:00
tkdrg
ffa51f8f0d Merge pull request #15162 from xxalpha/getareas
Fixes wizarditis teleport
2016-02-05 01:39:04 -03:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
AnturK
c8862a0c23 Removes unused debug datum 2016-02-04 17:23:53 +01:00
phil235
16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +01: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
tkdrg
1c2727d765 Merge pull request #15133 from Firecage/Moremodulemoves
Moves some more files to the modules section.
2016-02-03 22:09:12 -03: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
2bd13e700a get_areas_in_range()
nospace

wormhole
2016-02-03 07:10:34 +00:00
Cheridan
c0211799d3 Merge pull request #15104 from bgobandit/blackslimefluff
Black slime fluff better accounts for lizards.
2016-02-01 15:17:57 -06:00
Firecage
dbc744d9ee Moves the code for spells to the Modules section. 2016-02-01 19:33:44 +02:00
duncathan salt
52e60d80c9 Merge pull request #15089 from Firecage/atmos2modules
Take two of grouping the atmos files in modules.
2016-01-31 17:47:47 -06:00
tkdrg
7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
tkdrg
1158d540de Merge pull request #15058 from erwgd/BotanyToolsShakersForVendors
Added botany tools, salt and pepper shakers to vendors, changed how you get rice seeds
2016-01-31 13:23:21 -03:00
tkdrg
da056af83f Merge pull request #15018 from LanCartwright/fungaltbchange
removes fungal tb from traitor
2016-01-31 11:36:06 -03:00
bgobandit
81131e691f Black slime fluff better accounts for lizards. 2016-01-30 22:41:30 -05:00
phil235
743f28d348 Merge pull request #15038 from neersighted/newwizardmeta
End the new wizard meta
2016-01-31 02:17:45 +01:00
Akke
f0ef994da6 adds a nerf too
removes box
2016-01-30 19:42:13 +00:00
Firecage
6e27893e38 Take to of grouping the atmos files in modules. 2016-01-30 21:09:38 +02:00
AnturK
1cbb8137d9 Moves initialize from /atom/movable to /atom
Bit cleaner powernet/pipes initialization in templates
2016-01-30 14:34:34 +01:00
tkdrg
8c85f520bc Merge pull request #15019 from PKPenguin321/patch-11
fixes this easy as shit bug
2016-01-29 23:39:16 -03:00
erwgd
e0b9182f96 Adds rice seed to seeds supply crate 2016-01-30 02:10:30 +00:00
tkdrg
41fd32f91e Merge pull request #15003 from MrStonedOne/patch-140
[s]Fixes locate exploit in datum/topic_input
2016-01-29 19:36:37 -03:00
AnturK
8999db80b4 Fixes shuttles loading improperly in templates
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
Bjorn Neergaard
6fbee2bd03 End the new wizard meta
Prevent mindswap when suiciding

Fixes #14982
2016-01-29 09:32:59 -06:00
PKPenguin321
8e23924edc fixes this easy as shit bug
fuck git
2016-01-28 17:11:54 -08:00
Kyle Spier-Swenson
a664aab5e7 [s]Fixes locate exploit in datum/topic_input
Also holy fuck this datum is a thing.
2016-01-28 02:11:59 -08:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
5e2e295760 Fix wires swapping 2016-01-27 02:11:40 -06:00
Kyle Spier-Swenson
2db4f0f079 Update wires.dm 2016-01-26 18:48:10 -08:00
Razharas
e67012ef41 Merge pull request #14773 from ChangelingRain/punchy
Nerfs golem punch stun chances
2016-01-27 04:09:14 +03:00