Commit Graph

13650 Commits

Author SHA1 Message Date
Leo b5fa0bd014 Make it an else instead 2016-02-08 20:31:15 -02:00
Lzimann 3cceb1e379 Fix voice analyzers 2016-02-07 19:03:41 -02:00
phil235 a785d71e7e Fixes staminaloss going too high.
Fixes hud internals not updating correctly.
2016-02-07 20:12:23 +01:00
phil235 fc8c1f93b7 Fixes vision not being correctly updated in some cases when ghosting. 2016-02-07 19:01:09 +01:00
duncathan salt 94b91bcf57 Merge pull request #14947 from KorPhaeron/xenomorph
Adds the Lusty Xenomorph Maid
2016-02-07 10:08:12 -06:00
duncathan salt 56a4b89400 Merge pull request #15237 from AnturK/botfixfix
Fixes bot fixing
2016-02-07 10:06:53 -06:00
Cheridan 1449640867 Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 20:32:21 -06:00
tkdrg 90b5a5bfa5 Merge pull request #15154 from AnturK/brig_timers
Brig door timer tgui
2016-02-06 23:13:13 -03:00
KorPhaeron 143ae442d6 Sprites 2016-02-06 20:06:48 -06:00
tkdrg ed014be6f2 Merge pull request #15183 from Incoming5643/everybodys_heard_about_the_bird
Edict from the bird: "I've run out of jokes"
2016-02-06 22:49:06 -03:00
Incoming5643 b897507e73 Roll back the shuffle chance for the speech buffer
I wasn't aware this code ran every life tick!
2016-02-06 18:53:27 -05:00
Incoming 7939d069dc Feeding poly crackers (existing mechanic) will now boost his speak chance permanently
Some arbitrary renaming of the new savefile vars

makes what was essentially a prob call a prob call.
2016-02-06 18:50:23 -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 95d279a4a4 Removing the true_changeling.dm file that I added by mistake.
renamed "nearsight" fullscreen to "nearsighted"
2016-02-06 22:23:13 +01: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 20bf41a05d Fixes fullscreen overlay not appearing on login. 2016-02-06 20:35:43 +01: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 4e34ca775e Merge pull request #15219 from neersighted/reagents_aaaaaaa
Speed reagent reaction code
2016-02-06 16:15:50 -03:00
Bjorn Neergaard d1f748b09c comment style is important 2016-02-06 12:15:21 -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
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 7075b1f161 Fixes bot repair 2016-02-06 14:27:49 +01:00
tkdrg eda3c54d9d Merge pull request #15070 from MMMiracles/instagib
Adds an Instagib Rifle
2016-02-06 08:36:06 -03:00
AnturK a3dd5ece3f Brig door timer tgui
Remove unneeded require from few templates
2016-02-06 11:51:53 +01:00
Bjorn Neergaard 159ca02294 Find and replace strikes again 2016-02-06 04:05:03 -06:00
Cheridan 173ad9d331 Merge pull request #15232 from neersighted/tgui
Fix shuttles not correctly buying/selling
2016-02-06 02:29:37 -06:00
Bjorn Neergaard 6f05af73a3 Fix shuttles not correctly buying/selling
Empty crates are now sold properly, as well as being sold
only when centcomm is reached
2016-02-06 02:01:38 -06:00
Bjorn Neergaard 49860a87a3 Early morning coding is bad 2016-02-06 01:01:56 -06:00
Bjorn Neergaard f1a8fe786a Put the vars back; some other speed improvements
Apparently . = is not the one true way
;~; @RemieRichards
2016-02-05 18:57:09 -06:00
Bjorn Neergaard bb10a81310 Optimize more listmos procs, rename a few vars 2016-02-05 18:56:41 -06:00
Bjorn Neergaard 7822b1ee75 Lismos speed improvements 2016-02-05 18:55:39 -06: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 14ee8eec08 Fix tank UI for ghosts
istype is needed
2016-02-05 17:06:08 -06:00
Bjorn Neergaard 46fe1f82a5 Factor out filter to be more generic 2016-02-05 17:06:07 -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 fc513f9a47 Add generic "screen" capability to tgui
Also fix typo found in uplinks, random uses of 'src'
2016-02-05 17:06:05 -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 c5e6a922ca Cache canister updates and make huge scrubbers use power; add movable version 2016-02-05 17:06:03 -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
Bjorn Neergaard 302a02aa88 istypeless meme
@RemieRichards
2016-02-05 14:29:53 -06:00
Bjorn Neergaard 1e8ca7193c Speed reagent reaction code 2016-02-05 12:36:35 -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
tkdrg 6154334fbc Merge pull request #15201 from KorPhaeron/turret_fixes
Fixes AI core turrets shooting at pingsky
2016-02-05 14:58:38 -03:00
tkdrg 01b1ed7cc0 Merge pull request #15193 from xxalpha/putin
Fixes var edited SMES starting with no charge.
2016-02-05 14:56:53 -03:00