Commit Graph

531 Commits

Author SHA1 Message Date
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
duncathan salt
cb566509a9 Merge pull request #15728 from ChangelingRain/earlyblob
Blob event can now happen earlier
2016-02-26 13:23:21 -06:00
Nerd Lord
08b3c246e9 Blob event can now happen earlier.
Bonus; fixes a bug where blobbernauts spawned from factories would wander in the 5 seconds before they got a client
2016-02-24 12:10:00 -05:00
AndrewJacksonThe2nd
5d5d2427f4 temp 2016-02-20 22:12:25 -08:00
Cheridan
0c0d30a0f0 Merge pull request #15640 from tkdrg/kinder_egg_coding
Fixes the nar-sie event the right way.
2016-02-20 11:32:05 -06:00
tkdrg
a51c987ae2 Merge pull request #15589 from KorPhaeron/weather2
Fixes up weather performance
2016-02-20 09:31:12 -03:00
Tkdrg
734e57828f Fixes the nar-sie event the right way.
Weight 0 events still run for some stupid reason, they're just rare.
2016-02-20 08:46:02 -03:00
KazeEspada
e36c114ddf Fixes endless Nar-sies.
Hopefully this fixes the endless nar-sie storm.
2016-02-20 02:12:39 -07:00
xxalpha
cdd2673b15 Lower weight, later start. 2016-02-19 22:41:12 +00:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
KorPhaeron
67aec79ecf Weather 2016-02-17 16:28:59 -06:00
xxalpha
238329dba3 Removed mecha pilots from event; added no loot syndies 2016-02-17 15:05:21 +00:00
xxalpha
1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
tkdrg
90b5a5bfa5 Merge pull request #15154 from AnturK/brig_timers
Brig door timer tgui
2016-02-06 23:13:13 -03: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
AnturK
a3dd5ece3f Brig door timer tgui
Remove unneeded require from few templates
2016-02-06 11:51: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
Incoming
995352b818 Poly will now speak a line or emote when pet.
Poly is now much more likely to drop a line from active recall after saying a line. This doesn't actually impact how often poly says something, just how stale his "short term memory" is. Keep in mind that due to the wonders of saycode the line poly drops isn't the same necessarily as the one he said, so the "poly might say this line twice" factor is still higher than the 20% this pull implies. Also this mechanic means it's entirely possible to have roundstart lines be dropped having never been said.

speak_chance is now a proper percentage chance, before it was actually out of 200 for some strange reason. Animals with high speak chances have had their chance halved to preserve their level of chatter (except for poly).

Poly will now keep track of if he died last round and how many rounds in a row he's lived. While he's building on his record he'll have a few special lines he might say at some point near the beginning of the round and also talks FAR more often (to be annoying).

Adds a dumb monty python joke to dead parrots because we literally don't have any
2016-02-03 21:37:50 -05: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
bgobandit
63bd7d4fed colon never actually got in 2016-02-01 07:30:43 -05:00
bgobandit
e446e5f3ef Adds more Valentine messages and colors. 2016-02-01 06:43:36 -05:00
tkdrg
013016d4f3 Merge pull request #14103 from bgobandit/valentinestuff
Adds valentines and candy hearts for Valentine's Day.
2016-01-31 18:49:28 -03:00
xxalpha
876a17ddf6 Added stormtrooper 2016-01-31 21:18:41 +00:00
xxalpha
e49cfe16ef Fixed spawn bug; Narsie storm 2016-01-31 21:11:47 +00:00
xxalpha
3f53f11d0c Now the event spawns mobs from lists of types. 2016-01-31 17:23:05 +00:00
bgobandit
0a1a30f2a9 fixes razharas's dank meme 2016-01-29 20:30:46 -05:00
xxalpha
3df42cfdba Added new event: portal storm.
need the file of course

world name
2016-01-30 01:23:55 +00:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
87b0857b93 Refactor wire datums
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
Firecage
d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
xxalpha
aff9db930d Merge remote-tracking branch 'upstream/master' into emaggedbots 2016-01-19 14:38:26 +00:00
xxalpha
9a9aaabb8d Removed bot/Emag() proc. Silicons can't interface with human emagged bots. 2016-01-18 19:12:19 +00:00
xxalpha
577488e0d8 safepick
more safepick
2016-01-18 05:46:44 +00: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
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
Aranclanos
95df33b325 Merge pull request #14313 from tkdrg/goooof
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
2016-01-08 20:39:16 -03:00
duncathan salt
249bda699c Merge pull request #14428 from KorPhaeron/niknakflak
Fixes fake nuke
2016-01-08 07:18:03 -06:00
Tkdrg
5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
2016-01-07 23:15:35 -03:00
KorPhaeron
f2f868e7c7 Vine controller 2016-01-06 02:32:25 -06:00
KorPhaeron
cc69b62c5c Fixes fake nuke 2016-01-05 22:51:04 -06:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
tkdrg
e5941a59a2 Merge pull request #14124 from KorPhaeron/darkness
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -03:00
KorPhaeron
b9bf6ef547 Advanced Darkness 2015-12-31 19:32:02 -06:00