cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,777 Commits 94 Branches 23 Tags
d32cffaefea46ceb1fb53b68991ed027fa246517
Commit Graph
10113 Commits
Author SHA1 Message Date
Neerti 13d8bd47e7 Adds subtype of the AI core structure to disallow latejoining. 
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold.  This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
 2015-02-04 13:29:55 -05:00
SkyMarshal d5c8a6262a Fixes the fix for supersonic walking. 2015-02-04 10:33:39 -07:00
Ravensdale 7d502aa255 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 07:40:20 -08:00
Chinsky 4f541758c6 Merge pull request #8003 from Jamini/dev 
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
 2015-02-04 18:17:32 +03:00
Chinsky 8a46903231 Merge pull request #7830 from PsiOmegaDelta/CanTrack 
Camera tracking logic cleanup and tracking notice feature.
 2015-02-04 18:17:21 +03:00
Chinsky f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks 
Adds drying racks, tobacco, and updates pipes
 2015-02-04 18:15:13 +03:00
Chinsky 82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker 
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
 2015-02-04 18:14:22 +03:00
Chinsky f386d2eb47 Merge pull request #7979 from PsiOmegaDelta/GhostSight 
Ghosts now have more sight options.
 2015-02-04 17:31:21 +03:00
Ravensdale fcb2770004 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-04 05:15:23 -08:00
RavingManiac 8bc85c6bca Missing files added 2015-02-04 20:40:39 +08:00
SkyMarshal 952fd3a373 Fixes supersonic walking with canes. 2015-02-04 05:30:56 -07:00
PsiOmega f045f5b2e9 Timestamped speech for silicons. 2015-02-04 10:12:01 +01:00
PsiOmega 9352932e3d Timestamped radio for silicons 
All silicons now have timestamped radio messages.
 2015-02-04 10:04:18 +01:00
PsiOmega 1a1bf4a718 Silicons can now be easily renamed. 
Moves the AI SetName proc down silicon level.
 2015-02-04 09:48:30 +01:00
PsiOmegaDelta 1eaf311b25 Merge pull request #7887 from Zuhayr/pickaxes 
Renames pickaxes to drills, resprites accordingly.
 2015-02-04 06:32:37 +01:00
Chinsky a737dd0ca2 Merge pull request #7800 from Zuhayr/randmap 
Random map generator/distribution map refactor.
 2015-02-04 07:11:45 +03:00
Zuhayr 0091aca22c Merge with dev. 2015-02-04 11:05:35 +10:30
Zuhayr 11ec632c22 Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap 2015-02-04 11:03:44 +10:30
Zuhayr 3402912335 Merge with dev. 2015-02-04 11:03:13 +10:30
Ravensdale 84fa5379c5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity 2015-02-03 15:18:27 -08:00
PsiOmega 0ec47b225f Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/setup.dm
 2015-02-04 00:00:17 +01:00
Ravensdale 2e275d7e5e Area cleanup part 1: Engineering Department 2015-02-03 14:50:11 -08:00
PsiOmega 566f6a104e Carded AIs can no longer access cameras through camera consoles. 
Also includes fixes for hidden uplinks.
 2015-02-03 23:44:35 +01:00
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
 2015-02-04 04:44:09 +06:00
Kelenius cb25b524ab Gives slimes a HUD and an ability to choose face 2015-02-04 01:39:30 +03:00
PsiOmega a7a33e0a35 Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-02-03 22:28:53 +01:00
PsiOmega ffa13c68cb Merge remote-tracking branch 'upstream/dev' into CanTrack 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 22:27:22 +01:00
Kelenius c69bdd81a8 Working conflict fix 2015-02-03 23:38:35 +03:00
Kelenius c9824f62df Conflict fix 2015-02-03 23:29:08 +03:00
GinjaNinja32 7f12c68a4b Remove ethanol from chem synthesis 
Done on mobile. Might break.
 2015-02-03 19:58:20 +00:00
Kelenius 9edb5751fb Adds tobacco and maps in drying racks 2015-02-03 22:24:49 +03:00
PsiOmega 21a0aa05e5 Topic now uses the NanoUI can_interact_with_interface() proc to determine functionality. 
can_interact_with_interface() has been updated with the old canUseTopic() checks.
 2015-02-03 20:24:11 +01:00
Kelenius 536388978f Conflict fix 2015-02-03 20:57:16 +03:00
PsiOmega 9da907cef4 Breaks out NanoUI interaction checks into proper procs instead of type checks. 2015-02-03 18:56:35 +01:00
Kelenius 0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
GinjaNinja32 95ec6a4dfe Changes cure mechanism 2015-02-03 16:41:08 +00:00
GinjaNinja32 37f47fd3fa Merge remote-tracking branch 'upstream/dev' into viro 2015-02-03 16:28:10 +00:00
PsiOmegaDelta 021096d924 Merge pull request #7841 from comma/firefirEFIREBURNAHAHAHA 
Ported TG's code for burny mobs, by ergovisavi.
 2015-02-03 17:02:09 +01:00
Chinsky 71b19d5d8f Stupid typo & missing constants 2015-02-03 18:44:26 +03:00
GinjaNinja32 c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro 
Conflicts:
	code/modules/virus2/disease2.dm
 2015-02-03 15:33:37 +00:00
PsiOmegaDelta 24a7f5b5f0 Merge pull request #7938 from LethalGhost/dev 
More convenient give verb.
 2015-02-03 16:32:20 +01:00
Chinsky 84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 18:30:18 +03:00
GinjaNinja32 fa75cb9fab Change beakers, bottles, syringes and vials to use /image and multiplicative blending 2015-02-03 15:23:48 +00:00
Chinsky 576f9c84a3 Merge pull request #8016 from PsiOmegaDelta/Impersonation 
Voice changer impersonation now works.
 2015-02-03 18:16:23 +03:00
Chinsky 95ff9570ee Merge pull request #7930 from RKF45/newpaint 
Generic paint
 2015-02-03 18:15:42 +03:00
Chinsky 5ed006bcf0 Merge pull request #7902 from Kelenius/ofCratesAndMastermind 
Changes abandoned crate contencs and replaces minispess with mastermind
 2015-02-03 18:15:35 +03:00
Chinsky 889fee1b82 Merge pull request #7983 from PsiOmegaDelta/SynthStamp 
Timestamped AI radio messages.
 2015-02-03 18:14:44 +03:00
Chinsky 28ee1be312 Merge pull request #7952 from PsiOmegaDelta/AIEye 
Observers can now see the AI eye
 2015-02-03 18:14:08 +03:00
Chinsky b6ca496a93 Merge pull request #7617 from fira/obscomps 
Observers Improvements: Ghosts are able to spy on computers, SMES and APCs, with NanoUI and OldUI support
 2015-02-03 18:12:16 +03:00
Chinsky aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes 
refactor buckling + glowy HE pipes
 2015-02-03 18:12:09 +03:00