cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,418 Commits 74 Branches 23 Tags
eda4a5d5959de89d7edd2c90aa7b37f3650020f5
Commit Graph

21372 Commits

Author SHA1 Message Date
PsiOmegaDelta
eda4a5d595 Adds tape to medical, and excavation lockers. 
Also maps in some EMT medical tape, corrects some badly rotated intercoms, and pixel shifts the large sinks properly.
 2015-12-13 11:48:29 +01:00
PsiOmegaDelta
6ab585fbf2 Adds research and medical tape. 
To cordon dig sites, major medical incident areas, etc.
 2015-12-11 08:45:55 +01:00
GinjaNinja32
1979a909d4 Merge pull request #11651 from Zuhayr/dev 
Forensics fixes/tweaks.
 2015-12-10 10:44:01 +00:00
Zuhayr
c4c63b5d19 Forensics fixes/tweaks. 2015-12-10 19:34:28 +10:30
PsiOmegaDelta
dbbb5d2e86 Merge pull request #11650 from Baystation12/dev-freeze 
Dev
 2015-12-10 08:29:06 +01:00
PsiOmegaDelta
c4d6a76887 Merge pull request #11649 from Baystation12/master 
Dev-freeze
 2015-12-10 08:21:43 +01:00
Zuhayr
d6514ff2f2 Merge pull request #11646 from Ccomp5950/ninja_VANISH 
Ninjas teleporter:  Checks Z levels and distance.
 2015-12-10 09:54:49 +10:30
ccomp5950
f6f6a4ef87 Ninjas teleporter: Checks Z levels and distance. 
Ninjas are able to use a camera console and teleport across the map.  This resolves that.
 2015-12-09 17:27:27 -05:00
GinjaNinja32
a1f22d19b2 Merge pull request #11640 from PsiOmegaDelta/151209-LoadoutSafetyMeasures 
Gear loadout sanity checking.
 2015-12-09 21:34:48 +00:00
Chinsky
60e785da97 Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower 
Multitool Upgrade
 2015-12-09 21:34:12 +03:00
Chinsky
64b5623d70 Merge pull request #11544 from atlantiscze/inflatables-squashed 
Robot inflatables v2
 2015-12-09 21:32:27 +03:00
Chinsky
2e5547daec Merge pull request #11642 from GinjaNinja32/indentation 
Travis now checks incorrect indentation of absolute paths
 2015-12-09 21:32:17 +03:00
GinjaNinja32
1a46db4aaf fix #11637 2015-12-09 17:04:24 +00:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
Atlantis
d61a34e054 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed 2015-12-09 14:47:02 +01:00
PsiOmegaDelta
12b9d30923 Gear loadout sanity checking. 
Adds gear loadout sanity checking to reduce the risk of https://github.com/PolarisSS13/Polaris/issues/376 from happening, as well as ' /datum/'.
 2015-12-09 12:27:41 +01:00
GinjaNinja32
5b7f9cd114 Merge pull request #11639 from PsiOmegaDelta/151209-GhostFix 
Fixes ghost examination bug.
 2015-12-09 08:14:55 +00:00
Chinsky
c9542be1ce Merge pull request #11630 from PsiOmegaDelta/151207-RotationalIcons 
Rotational icons
 2015-12-09 11:08:24 +03:00
Neerti
af3bdef777 Fixes ghost examination bug. 2015-12-09 09:03:39 +01:00
Hubblenaut
706e12e9ab Camera Hotfix 2015-12-09 09:03:01 +01:00
GinjaNinja32
b232cc6e13 fix chair rotation with Spin-View 2015-12-08 16:21:15 +00:00
PsiOmegaDelta
df55f3d155 Rotational icons. 
/icons/turf/walls.dmi - rock_side
Made rock_side rotational, adjusted code as necessary.
Fixes an incorrect icon state reference.
 2015-12-08 16:13:55 +01:00
GinjaNinja32
0b76c62a8d Merge pull request #11632 from Ccomp5950/fix_nvgs_and_shit_that_changes_see_invis 
Fixes NVGs and other items that change see_invis.
 2015-12-08 08:13:45 +00:00
PsiOmegaDelta
185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
 2015-12-08 08:23:10 +01:00
PsiOmegaDelta
0f986b0098 Compilation fixes. 2015-12-08 08:10:59 +01:00
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
ccomp5950
c919aabfd5 Fixes NVGs and other items that change see_invis. 
I blame a bad merge or something.  There is no reason for vision changes to be made in this part of the code.
 2015-12-08 01:05:46 -05:00
PsiOmegaDelta
78718480d5 Rotational icons. 
/icons/obj/policetape.dmi
* Makes the icons gray scale, and cardinally rotational.
 2015-12-07 22:50:25 +01:00
Chinsky
1e5d6f9f57 Merge pull request #11567 from PsiOmegaDelta/151202-PlasmaCuttingPower 
Adds energy costs to some rig equipment.
 2015-12-07 19:58:19 +03:00
Chinsky
1b77cd0b0f Merge pull request #11599 from PsiOmegaDelta/151205-MoreCharacterSetupOptions 
Changes the character setup update flow.
 2015-12-07 19:58:01 +03:00
PsiOmegaDelta
2402b3ccd8 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-07 17:56:27 +01:00
Chinsky
cbf51f9c73 Merge pull request #11605 from mwerezak/click-cooldown 
Adds click cooldowns
 2015-12-07 19:56:23 +03:00
Chinsky
106d53fa3c Merge pull request #11602 from PsiOmegaDelta/151205-AIClickRuntime 
AI clicking no longer overrides the state in Topic calls.
 2015-12-07 19:56:04 +03:00
Chinsky
8c6011de3f Merge pull request #11588 from PsiOmegaDelta/151204-DisposalsEverywhere 
Fixes floors not hiding all intended objects.
 2015-12-07 19:55:54 +03:00
Chinsky
b1ec8253a1 Merge pull request #11587 from PsiOmegaDelta/151204-WizardsAreTheWorst 
Wizard spell Destroy() additions.
 2015-12-07 19:55:02 +03:00
Chinsky
b9dfa4c3ea Merge pull request #11619 from PsiOmegaDelta/151206-NoMoreMusic 
/area var cleanup.
 2015-12-07 19:54:19 +03:00
PsiOmegaDelta
68c3185720 Merge pull request #11625 from BlueNexus/botaccess 
Gave the roboticists access to their own bots
 2015-12-07 17:54:11 +01:00
Chinsky
8a51d91378 Merge pull request #11620 from PsiOmegaDelta/151207-Sparks 
Sparks now qdel() cleanly.
 2015-12-07 19:53:52 +03:00
Chinsky
021112e427 Merge pull request #11622 from PsiOmegaDelta/151207-RadioLoopFix 
Infinite recursion radio hacking fix.
 2015-12-07 19:53:21 +03:00
Chinsky
d6a6187989 Merge pull request #11628 from PsiOmegaDelta/151207-RadioFlip 
Re-rotates radio intercom icons.
 2015-12-07 19:52:26 +03:00
PsiOmegaDelta
0db775938d Re-rotates radio icons. 
Little to see here.
 2015-12-07 15:19:42 +01:00
GinjaNinja32
0b8bc7fb0b Merge pull request #11623 from BlueNexus/mechafix 
Fixes #11470
 2015-12-07 13:59:15 +00:00
Atlantis
0e78d9b51c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed 2015-12-07 13:55:48 +01:00
Atlantis
e493fe0134 Robot inflatables v2 
- Re-opened version of #9274 with few minor adjustments and reduced commit amount.

- Creates new device - Inflatables Dispenser(ID) that can be used to deploy/undeploy inflatables
- IDs are added to Engineering, Construction and Crisis robot modules
- Three IDs replace three boxes of inflatables in engineering storage.
- Re-adjusted weights of inflatables. IDs and boxes may now fit in backpacks, deflated inflatables may fit into pocket.
 2015-12-07 13:52:51 +01:00
BlueNexus
e071ac7358 Added holder to the locked vars list 
I'm very surprised a security loophole like this wasn't noted earlier.
 2015-12-07 12:07:08 +00:00
BlueNexus
467817986d Reverted secbot access 
Since Psi mentioned it, Secbots should probably be the exception.
 2015-12-07 11:51:30 +00:00
BlueNexus
2ff05a9853 Gave the Roboticist farmbot access 2015-12-07 11:43:30 +00:00
BlueNexus
c2c521e986 Gave the Roboticist floorbot access 2015-12-07 11:39:58 +00:00
BlueNexus
34df328d04 Gave the Roboticist medbot access 2015-12-07 11:39:29 +00:00
BlueNexus
195eada125 Gave the Roboticist secbot access 2015-12-07 11:39:02 +00:00