Commit Graph

13853 Commits

Author SHA1 Message Date
Nerd Lord 7369a3a92e proc to set random blob chemical, instead of having the verb do it 2016-02-06 21:00:06 -05:00
Nerd Lord c28c1203cd Adds five new blob chemicals.
Blob mobs now heal for 2.5% of their maxhealth when blob_act()ed, basically whenever they're on the blob
Blob expansion no longer has a chance to fail inversely proportional with the expanding blob's health.
Blobbernauts have slight color differences.
2016-02-06 19:32:30 -05:00
Nerd Lord 86f7b98baf Revert "Simple animal force threshold no longer converts damage to brute" 2016-02-06 17:25:44 -05:00
phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
tkdrg f00e9588fd Merge pull request #14992 from KorPhaeron/flashlights
Adds laserguns with rechargeable, swappable magazines
2016-02-06 16:36:03 -03:00
phil235 aed7794f50 Made changes to adjust with neersighted's fullscreen overlays pr.
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
2016-02-06 20:35:15 +01:00
tkdrg e6cb39624e Merge pull request #15208 from KorPhaeron/pinpointer
Gives ops pinpointers by default
2016-02-06 16:27:25 -03:00
KorPhaeron ee3892f20d Consistency in pinpointer placement 2016-02-06 13:19:52 -06:00
KorPhaeron 66f8d450ac Chaplain weapon code cleanup 2016-02-06 12:10:48 -06:00
KorPhaeron 9b9da55178 Removes excess pinpointers 2016-02-06 11:37:29 -06:00
tkdrg 7b602a35b5 Merge pull request #15217 from neersighted/flashy
Fix flashlights flashing
2016-02-06 14:21:14 -03:00
tkdrg 0dbbcce675 Merge pull request #15216 from KorPhaeron/fixes_bulldogs
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
KorPhaeron 902b5d2db1 Fixes update icon 2016-02-06 11:19:21 -06:00
TrustyGun 99f2200d10 doh 2016-02-06 10:58:56 -05:00
TrustyGun 55f9adfa87 The janitor's belt can now hold his keys
This always bothered me.
2016-02-06 10:41:38 -05: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
AnturK 63d5e8ce4b proc name change 2016-02-06 12:23:32 +01:00
AnturK a3dd5ece3f Brig door timer tgui
Remove unneeded require from few templates
2016-02-06 11:51:53 +01:00
Cheridan 8d3e80be2a Merge pull request #15212 from Shadowlight213/lingcamo
Fixes Changeling digital camo toggle.
2016-02-06 02:30:46 -06:00
tkdrg c4cb425b5f Merge pull request #15195 from GunHog/Hack_ALL_The_Tiles!
Doomsday and Self-Destruct now change ALL the blue circuit tiles!
2016-02-06 01:37:40 -03: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 615d390be0 Add missing span class, fix webfont fallback 2016-02-05 17:06:09 -06:00
Bjorn Neergaard 14ee8eec08 Fix tank UI for ghosts
istype is needed
2016-02-05 17:06:08 -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
Bjorn Neergaard 9783f47514 Centralize shuttle computers 2016-02-05 17:06:04 -06:00
Bjorn Neergaard 29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard 796cca2753 tgui scrubbers
removes area atmos computer
2016-02-05 17:06:02 -06:00
Bjorn Neergaard c9f61fd7da Rework portable atmos; tgui portable pump 2016-02-05 17:06:00 -06:00
Bjorn Neergaard af19bff008 tgui sleepers and uplink search
Fix some state logic
Fix SVGs
display: based filtering
input component

Update syndicate colors

@ChangelingRain
2016-02-05 17:05:59 -06:00
GunHog f592ce1aa8 Fix + Nitpick management 2016-02-05 12:41:55 -06:00
KorPhaeron 2f6c9ec50e Bulldog Fix 2016-02-05 12:06:53 -06:00
Bjorn Neergaard 289f0c19e1 Fix flashlights flashing 2016-02-05 12:06:44 -06:00
Remie Richards 10f725d216 Merge pull request #15119 from lordpidey/pipe_suicide
Added a new suicide act for pipe valves.
2016-02-05 15:53:24 +00:00
Shadowlight213 20d55b9adb Fixes Changeling digital camo toggle. 2016-02-04 23:21:42 -08:00
tkdrg ef62a9ec5e Merge pull request #15169 from lzimann/mechabuff
Makes mech don't suck while destroying walls
2016-02-05 02:44:14 -03:00
Leo b456fe3807 Remove bump() change 2016-02-05 02:41:40 -02:00
tkdrg ffa51f8f0d Merge pull request #15162 from xxalpha/getareas
Fixes wizarditis teleport
2016-02-05 01:39:04 -03:00
Leo 2e3470d736 Removed parent call 2016-02-05 02:18:20 -02:00
tkdrg dbf0c75914 Merge pull request #15185 from ChangelingRain/poinomaly
Anomalies now appear on the POI list.
2016-02-05 01:03:46 -03:00
tkdrg a129b1fdaf Merge pull request #15182 from ChangelingRain/complexanimals
Simple animal force threshold no longer converts damage to brute
2016-02-05 01:03:21 -03:00
tkdrg dbfacb31db Merge pull request #15172 from xxalpha/doomsdayfix
Fixed doomsday device spamming.
2016-02-05 01:00:10 -03:00
KorPhaeron 8c25882aad Gives ops pinpointers by default 2016-02-04 21:22:13 -06:00
tkdrg b3daf4be22 Merge pull request #14981 from neersighted/510
BYOND 510
2016-02-05 00:04:59 -03:00
Bjorn Neergaard ac03d5f617 Fix flashlights actually stunning
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
2016-02-04 20:50:26 -06:00
GunHog 5bf76a3c14 Now supports all the types, yayA! 2016-02-04 20:29:34 -06:00
phil235 1be9855d4f Merge pull request #15174 from kingofkosmos/healthanalyzerhealthfix
Health analyzer percentage fix
2016-02-05 02:07:57 +01:00
phil235 5728358b6b Some errors and merge conflicts fixing mistakes. 2016-02-05 01:12:39 +01:00
duncathan salt d9672fa638 Merge pull request #15176 from ChangelingRain/fixedblobchemicals
Blob tweaks and a new blob chemical
2016-02-04 18:02:45 -06:00
KorPhaeron d27268f094 Grammar fixes, adds carp-sie plushie 2016-02-04 17:58:47 -06:00
Nerd Lord f96290ff81 weakens death EMP 2016-02-04 18:54:01 -05:00