cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,363 Commits 74 Branches 23 Tags
1921c35231cd5ee20c4de373f42ebe0cb1876089
Commit Graph

21332 Commits

Author SHA1 Message Date
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +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
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
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
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
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
GinjaNinja32
a569a0fe30 Merge pull request #11609 from mwerezak/pipeline-fix 
Fixes #11594
 2015-12-06 10:22:23 +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
6688fc49fb Adds logging for regular suicide 2015-12-06 02:43:50 -05:00
mwerezak
29192fd8e8 Fixes #11466 2015-12-06 02:35:18 -05:00
mwerezak
e6790c7e6d Fixes #11594 2015-12-06 02:24:37 -05:00
Zuhayr
c4ac5e2bd3 Merge pull request #11606 from mwerezak/firemode-fix 
Fixes #11477
 2015-12-06 17:51:12 +10:30