cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-31 20:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,299 Commits 74 Branches 23 Tags
62f7ddac25b740f3f37451bcada234c0179d5708
Commit Graph

6343 Commits

Author SHA1 Message Date
PsiOmegaDelta
62f7ddac25 Compilation fixes. 2015-12-06 11:50:08 +01:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev. 
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
 2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
GinjaNinja32
19b24452db Merge pull request #11443 from Hubblenaut/dev 
Changes to Mob Bump Mechanics
 2015-12-05 19:01:56 +00:00
GinjaNinja32
9c76f1dfb4 Merge pull request #11547 from Kearel/alcatrazSynth 
Adds Alcatraz Icons for Borgs
 2015-12-05 18:57:52 +00:00
Kearel
45c2f54998 Change name from alcatraz to eyebot 2015-12-05 12:42:11 -06:00
GinjaNinja32
58dda1e96d fix autohiss for fully-capitalised strings 2015-12-05 06:53:26 +00:00
Zuhayr
834f86241a Alters an unEquip() conditional in Give(). 2015-12-05 00:49:35 +10:30
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze 
Bunch of IPC fixes.
 2015-12-04 11:28:25 +03:00
Chinsky
5df915b638 Merge pull request #11534 from PsiOmegaDelta/151129-GeneralTasks 
Adds a process for general tasks
 2015-12-04 11:26:00 +03:00
Zuhayr
398541f4eb Amendments. 2015-12-04 18:14:40 +10:30
Zuhayr
0cf5a709d1 Refactored give(). 2015-12-04 17:58:53 +10:30
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
Zuhayr
cc8b37562a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into drones2 2015-12-04 16:53:44 +10:30
GinjaNinja32
7779cd218a Merge pull request #11578 from PsiOmegaDelta/151203-RestrainedIncapacitation 
Makes it possible to ignore some incapacitation checks.
 2015-12-04 05:14:16 +00:00
PsiOmegaDelta
ff15635aef Makes it possible to ignore some incapacitation checks. 
This fixes  #11576. Also corrects the viewers() usage in visible_message.
 2015-12-03 12:52:38 +01:00
PsiOmegaDelta
448e743308 Merge remote-tracking branch 'upstream/dev' into 151129-GeneralTasks 
Conflicts:
	code/game/machinery/computer/atmos_alert.dm
 2015-12-03 10:18:39 +01:00
Zuhayr
e83a8adc2c Generalizes the accessory system to work for suits. 2015-12-02 18:04:21 +10:30
GinjaNinja32
8303404678 Merge pull request #11553 from PsiOmegaDelta/151201-RandomLobby 
Adds the ability to have random lobby screens.
 2015-12-01 23:58:08 +00:00
GinjaNinja32
f9c513a3dd Merge pull request #11552 from PsiOmegaDelta/151201-HoloMovement 
The AI can now toggle hologram eye tracking.
 2015-12-01 23:57:59 +00:00
Zuhayr
a56618119a Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams 
Replaces 'in world' arguments.
 2015-12-02 09:56:28 +10:30
PsiOmegaDelta
a32be3f359 Adds the ability to have random lobby screens. 
A random lobby screen is now picked at server start, and presented to all players. Sadly in our case we currently only have one every day lobby screen.
Port of https://github.com/PolarisSS13/Polaris/pull/321, with added sanity checking.
 2015-12-01 15:55:18 +01:00
Hubblenaut
bf5b206224 Changes to Pushing Mechanics 
- Being on help intent will never push a mob/living
 - Mobs on help intent will not swap positions when either are pulling
   something
 2015-12-01 14:18:50 +01:00
PsiOmegaDelta
7803da0e11 The AI can now toggle hologram eye tracking. 
Allows the AI to use the "Toggle Hologram Movement" verb to toggle whether the hologram should follow the AI eye or not.
Also adds a check to ensure that the holopad can see the hologram, otherwise it shuts down.
Partial port of https://github.com/PolarisSS13/Polaris/pull/11.
 2015-12-01 12:18:00 +01:00
Zuhayr
b3d1ed5985 Removing a world that snuck back in after rebase. 2015-12-01 21:41:17 +10:30
Zuhayr
2d3c69157a Rewriting some pull logic. 2015-12-01 21:31:58 +10:30
Zuhayr
9a3038a85c Generalized pulling restrictions to mob level. 2015-12-01 21:23:35 +10:30
Zuhayr
6b2a24841b Holders now pass on their contained mob's ID card. 2015-12-01 21:23:11 +10:30
Chinsky
8ce8d3998e Merge pull request #11495 from Zuhayr/qol 
More small QOL changes.
 2015-12-01 10:05:20 +03:00
Kearel
d09dee9f60 Adds Alcatraz Icons for Borgs 2015-11-30 19:16:14 -06:00
PsiOmegaDelta
eb3a266444 Merge pull request #11507 from Zuhayr/dev 
Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators.
 2015-11-30 16:55:14 +01:00
Zuhayr
e6ec26bb0a Tweaks to the previous commits. 2015-12-01 02:14:47 +10:30
Zuhayr
502d700387 Comments out the starving/overfed examine lines. 2015-12-01 02:05:28 +10:30
Zuhayr
5d31d54f72 Drones now get a jetpack and extinguishers. 2015-12-01 02:05:27 +10:30
Zuhayr
3e38598244 You can now pull your punches when engaging in unarmed combat. 2015-12-01 02:04:39 +10:30
Zuhayr
e2ce3fbb08 Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-01 02:04:10 +10:30
PsiOmegaDelta
88de024ad6 Relables alarm (un)registration to (un)register_alarm. 2015-11-29 12:32:19 +01:00
Zuhayr
a32d69d434 Added possession_candidate to several voted mob types. 2015-11-23 05:52:50 +10:30
Zuhayr
e5ec6c761b Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators. 2015-11-23 05:52:33 +10:30
PsiOmegaDelta
f74d9e6862 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm
 2015-11-22 11:48:00 +01:00
PsiOmegaDelta
c5333cabea Merge pull request #11474 from comma/slipping 
Refactored slipping code a little.
 2015-11-22 11:19:30 +01:00
Chinsky
a04613cfb0 Merge pull request #11493 from Zuhayr/dev 
Fixes several issues with drones.
 2015-11-22 12:31:30 +03:00
Zuhayr
055fe07054 Amending drone mob size. 2015-11-22 19:52:14 +10:30
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
6e69442545 Replaces 'in world' arguments. 
Arguments acquired from 'in world' cannot be GCd for several minutes due to a hidden reference from usr to the argument itself.
This replaces all 'in world' arguments with 'in range(world.view)', with the notable exception of "View Variables".
 2015-11-21 11:06:08 +01:00
Zuhayr
c20275ae64 Fixes minor oversight with robot icon code. 2015-11-21 16:10:57 +10:30
Zuhayr
6d15c43377 Fixes several issues with drones. 2015-11-21 15:01:43 +10:30
Bjorn Neergaard
6b742bd44f Add /tg/-style attack animations 
Thanks to @GinjaNinja32 for some style tweaks
 2015-11-20 15:45:16 -05:00
PsiOmegaDelta
c826d3d237 Fixes being unable to eat. 
Silly 1-based indexing.
 2015-11-20 11:21:39 +01:00