Commit Graph

729 Commits

Author SHA1 Message Date
Zuhayr f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Datraen e443ffd06a Changes time to respawn down to 15 minutes. 2015-12-22 15:04:23 -05:00
PsiOmegaDelta 5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
PsiOmegaDelta f62f24e1ac Removes Stat() sleep.
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
Zuhayr 6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Zuhayr 0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
Datraen ca6a970182 Fixes the inability to use cargo tugs 2015-12-05 15:15:53 -05:00
PsiOmegaDelta 2d39621801 Makes it possible to ignore some incapacitation checks.
This fixes  #11576. Also corrects the viewers() usage in visible_message.

Conflicts:
	code/__defines/mobs.dm
	code/modules/mob/living/carbon/resist.dm
2015-12-03 12:37:30 -05:00
PsiOmega 5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega 5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
PsiOmegaDelta bb5680193f Converts some loc = to forceMove()
Fixes #11102.
2015-09-14 11:13:15 +02:00
Zuhayr dfbdd79375 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev 2015-08-29 16:53:42 +09:30
Zuhayr 7d82e4850e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-29 16:53:07 +09:30
PsiOmega c5e09c30d6 Alters the round duration format, increases Stat inactivity timeout.
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
2015-08-27 20:01:38 +02:00
Zuhayr c6964a9b0e Fixes for previous commits. 2015-08-24 18:31:52 +09:30
Zuhayr a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol
Conflicts:
	code/_onclick/rig.dm
2015-08-22 02:36:05 +09:30
Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
GinjaNinja32 912f689e51 Diagonal, ctrl+dir, and alt+dir actions are now consistent with client.dir 2015-08-18 16:05:37 +01:00
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
NullSnapshot e99f98e13f No need for the statpanels. 2015-08-16 23:24:25 -07:00
NullSnapshot 438837a9be Moves ProcessScheduler list to new Processes tab. 2015-08-16 22:46:18 -07:00
PsiOmega 4d826e68cb Mob bump fixes.
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
2015-08-16 20:55:02 +02:00
PsiOmega 1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
PsiOmegaDelta 62155433c2 Merge corrections.
Fixes the todo:s I claimed I'd fix at merge.
2015-08-13 10:17:03 +02:00
Zuhayr 59d0e28aff Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead.
Allows AIs/pAIs in rigs to use the selected module via middle click.
2015-08-13 17:09:22 +09:30
PsiOmegaDelta 1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
Kelenius 60196df634 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
mwerezak 62ad3a7be4 Fixes #10593
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
2015-08-12 22:24:14 -04:00
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
PsiOmegaDelta 617db485ee qdel/Destroy entries. 2015-07-21 14:22:01 +02:00
PsiOmegaDelta 616b4b60e4 Magical fixes.
The wizard den is no longer pitch black.
Fixes targeted spells using the wrong caster/source.
Adds some missing checks using the caster source above.
Re-logging should no longer cause a loss of spell UI icons.
Mind transfer should no longer cause unintended spell loss.
2015-07-21 11:34:25 +02:00
PsiOmegaDelta 388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
2015-07-20 08:28:32 +02:00
mwerezak 4ea1379b33 Fixes #10230
Moves throw mode procs up to /mob level, clicking on a non-turf or an
atom that is not in a turf cancels throw mode.
2015-07-18 23:27:09 -04:00
Kelenius eb64e0c5b6 Fixes a bug where mob sees visible message twice 2015-07-06 15:58:31 +03:00
Zuhayr 9a7515af8f Merge with dev-freeze. 2015-07-02 19:04:01 +09:30
mwerezak 32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
PsiOmegaDelta a76c915e2e Adds missing changelog icon to the client pre-fetch. 2015-06-30 15:13:28 +02:00
PsiOmegaDelta f420dd9f01 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/silicon.dm
	code/setup.dm
2015-06-30 08:59:34 +02:00
PsiOmegaDelta cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
2015-06-30 08:24:43 +02:00
mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
mwerezak 4062f81f20 Fixes #7910
Partial port from vgstation.

Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb.  check_eye() now returns the vision
flags to be set on the viewer.  Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
2015-06-28 11:59:19 -04:00
PsiOmegaDelta 341b29c34a Merge remote-tracking branch 'upstream/dev' into 150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-17 16:10:26 +02:00
PsiOmegaDelta 9d38bcc149 mob/living/Life() now handles regular status updates. 2015-06-17 16:01:26 +02:00
PsiOmegaDelta 838739c4ed mob/living/Life() now handles updating pulling. 2015-06-17 15:35:41 +02:00
PsiOmegaDelta 06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega ee88e7b8b4 Base Life-addition() 2015-06-13 13:36:08 +02:00
Zuhayr cef958cac2 Fixes #9503 2015-06-10 23:14:33 +09:30
Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
2015-06-07 14:05:54 +03:00
Chinsky d4eb0e82bb Merge pull request #9293 from RavingManiac/dev
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
RavingManiac 839d3b0588 Ability to head blind_message when invisible people do things readded
Tape recorder playback uses audible_message instead of visible_message
2015-05-22 00:02:36 +10:00