cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 11:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,434 Commits 74 Branches 23 Tags
2f73635cf3cb31281150da04523325bce129bd5a
Commit Graph

13078 Commits

Author SHA1 Message Date
Chinsky
39af995c05 Merge pull request #11641 from PsiOmegaDelta/151209-BlobTweak 
Blob tweaks.
 2015-12-12 02:56:43 +03:00
Chinsky
21f8c4aef1 Merge pull request #11645 from PsiOmegaDelta/151209-CableRainbow 
Now possible to change cable coil color using a multitool.
 2015-12-12 02:54:49 +03:00
PsiOmegaDelta
a29bbc28c0 Cargo tugs now uses a more finally grained incapacitation check. 2015-12-11 13:48:18 +01:00
PsiOmegaDelta
e0c092fc54 Cleans up the previous commit's use of stacktype. 2015-12-11 11:18:27 +01:00
Hubblenaut
6b37b860d7 Fixes subcategories of cable coils not being mergeable 2015-12-11 11:09:11 +01:00
Datraen
6120e09684 Fixes the inability to use cargo tugs 2015-12-11 11:08:00 +01:00
PsiOmegaDelta
5ffa49d994 Blob tweaks. 
The blob no longer holds the entire obj process hostage while it sleeps.
The blob now respects its own growth limit. Fixes #11627.
Blobs still grow in an X-shape but this should now be much less distinct.
 2015-12-10 13:20:20 +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
PsiOmegaDelta
d43cf313c0 Relocates color definitions. Lowercases color definitions. 2015-12-09 21:49:58 +01:00
PsiOmegaDelta
abcd965dde Now possible to change cable coil color using a multitool. 
Obviously using the same methods that borgs use to change the cable coil color internally.
 2015-12-09 20:20:28 +01: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
Chinsky
c9542be1ce Merge pull request #11630 from PsiOmegaDelta/151207-RotationalIcons 
Rotational icons
 2015-12-09 11:08:24 +03: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
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
8c6011de3f Merge pull request #11588 from PsiOmegaDelta/151204-DisposalsEverywhere 
Fixes floors not hiding all intended objects.
 2015-12-07 19:55:54 +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
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
BlueNexus
f1a25e0957 Gave the Roboticist cleanbot access 
Using the browser version of github at the moment, so expect a commit for each bot.
 2015-12-07 11:38:08 +00:00
BlueNexus
050c1f631a Added a missing update_icon() 2015-12-07 11:27:33 +00:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
d4173355c6 Sparks now qdel() cleanly. 
Also takes the opportunity to remove some exces /effect/ pathing.
 2015-12-07 09:19:06 +01:00
PsiOmegaDelta
6299f9cc13 Fixes the broken Antag Uplink. 
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607.
 2015-12-06 16:24:40 +01:00
PsiOmegaDelta
da946eda99 Adds energy costs to some rig equipment. 
Plasma cutter - 5 units
Drill - 1 unit
 2015-12-06 13:30:28 +01:00