cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-26 01:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,586 Commits 75 Branches 23 Tags
e61eb26da9e902bb84fcf562fc09b75ce28a00a1
Commit Graph

404 Commits

Author SHA1 Message Date
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
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
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
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
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
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
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation 
Attack animations
 2015-05-21 06:52:30 +02:00
RavingManiac
53eec427dc Typo fix. Obsolete viisible_message() hack removed from mob holders 2015-05-17 17:15:27 +10:00
RavingManiac
22cafb9c48 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-05-17 17:01:43 +10:00
RavingManiac
f66cf9af05 get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications 
Transmission of emotes, visible_message() and say() refactored. All three use get_mobs_or_objects_in_view() to find objects and mobs in containers

Storage objects and closets no longer transfer hear_talk(), see_emote() or show_message() to contents, as this is already covered by the above changes
 2015-05-17 16:54:18 +10:00
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-05-16 22:38:01 +02:00
mwerezak
9ae57e95e1 Moves mob animations to a new source file, adds attack animation 2015-05-16 12:44:49 -04:00
RavingManiac
c67ed25b85 visible_message() now affects objects. Holopads, pAIs, AI cards people in mecha should hence be able to see them 
Tape recorders record hearable emotes and action messages

Human and robot emotes now use custom_emote()
 2015-05-16 16:01:41 +10:00
Techhead0
35e44ab8d9 Invisible people can now be heard by visible_message 
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
 2015-05-15 21:06:16 -04:00
Zuhayr
1e1471a601 Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173. 2015-05-15 23:19:57 +09:30
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
volas
7dedbc6d78 Alternative copytext, safe for html entities 2015-04-19 12:37:04 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
PsiOmega
3edfbf0040 Moves us to the changelog system used by /vg/, /tg/, and others. 
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
 2015-04-18 13:00:28 +02:00
PsiOmega
4748020ff2 Cleans up the Status panel. 2015-04-16 15:47:48 +02:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
1bd4f21c58 Makes objects without moues opacity not appear via alt-click. 
Prevents clicking objects you should not be able to click.
 2015-04-15 08:31:40 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Chinsky
e6f83f8fa2 Merge pull request #8707 from PsiOmegaDelta/Garbage 
Ports /vg/&/tg/'s garbage collector.
 2015-04-09 08:50:12 +03:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
PsiOmega
c305b389f7 Ports /tg/'s & /vg/'s garbage collector/object pool. 
It's happening. Kind of, the code is there.
 2015-04-02 14:48:28 +02:00