cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,875 Commits 74 Branches 23 Tags
afd526126d8f4d4e36a42b51fa9cfbc6bea18f14
Commit Graph

13294 Commits

Author SHA1 Message Date
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
Kearel
7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06: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
Jon
c9b7a8ece3 Updates all get_base_turf usages to get_base_turf_by_area. 
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.

Conflicts:
	code/game/area/Space Station 13 areas.dm
 2015-12-06 14:01:21 -05: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
PsiOmegaDelta
079ea9ad9a Merge remote-tracking branch 'upstream/dev' into 151205-MoreCharacterSetupOptions 
Conflicts:
	code/modules/client/preferences.dm
 2015-12-06 12:15:04 +01:00
PsiOmegaDelta
12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 
Conflicts:
	code/modules/nano/nanoui.dm
 2015-12-06 12:10:33 +01:00
PsiOmegaDelta
ac3f159125 Incapacitation. 2015-12-06 11:53:46 +01:00
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
85bb2778d0 Merge pull request #11610 from mwerezak/suicide-logging 
Fixes #11466
 2015-12-06 10:23:31 +00:00
mwerezak
39ab31cbf8 Removes unused ORGAN_ATTACHABLE define 2015-12-06 04:34:33 -05:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak
5de9314803 Clears reference to parent when removing external organs 2015-12-06 03:57:15 -05:00
mwerezak
2312631508 Fixes #11510 
Splashing and external transfer now checks if the container is open
 2015-12-06 02:49:46 -05:00
mwerezak
d508893e3c Tweaks pointblank multipliers to play better with droplimb thresholds 2015-12-06 02:44:09 -05:00
mwerezak
29192fd8e8 Fixes #11466 2015-12-06 02:35:18 -05:00
Zuhayr
c4ac5e2bd3 Merge pull request #11606 from mwerezak/firemode-fix 
Fixes #11477
 2015-12-06 17:51:12 +10:30