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

21360 Commits

Author SHA1 Message Date
PsiOmegaDelta
b2720a8c6c Fixes sparks causing runtimes on pooling. 2015-12-09 20:41:55 +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
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
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
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
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
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
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
BlueNexus
908ae91a08 Can no longer enter mechs while buckled 2015-12-07 11:17:12 +00:00
Neerti
1851af1031 Infinite recursion radio hacking fix. 
Fixes #11618.
 2015-12-07 11:34:42 +01:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
9d0e13b977 Merge pull request #11608 from mwerezak/soap-fix 
Fixes runtime when cleaning turfs with soap
 2015-12-07 09:42:33 +01:00
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
2779cd48f3 Removes the area music var, replaces it with ambiance where possible. 2015-12-06 20:15:31 +01:00
HarpyEagle
93233b6dd9 Adds soap wetting log message 2015-12-06 14:03:33 -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