cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 06:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,715 Commits 74 Branches 23 Tags
f249bf3bccc83eeb6e5841d6b2ea8d04701f290c
Commit Graph

5137 Commits

Author SHA1 Message Date
Vivalas
8b6650d217 Briefcase Fix 2015-09-30 17:10:57 -05:00
PsiOmega
63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
mwerezak
03cb79a85d Merge pull request #11187 from PsiOmegaDelta/150925-Destruction 
Destroy tweaks.
 2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity 
Makes more sources of radiation respect rad-protection.
 2015-09-26 20:10:47 -05:00
Joseph Heinemeyer
9e9df0a15d Delete ladders.dm 2015-09-26 17:43:52 -07:00
Hubblenaut
f0481b551e Fixes grab-buckling overwriting pixelshift 2015-09-26 14:11:01 +02:00
PsiOmega
a3b9ab1236 Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection. 2015-09-26 09:19:58 +02:00
Chinsky
dbbf6bb11e Merge pull request #11158 from PsiOmegaDelta/150920-MoreGlow 
Glowy items.
 2015-09-25 15:03:39 +03:00
Chinsky
407f5bbac3 Merge pull request #11182 from Hubblenaut/dev 
Lowers the belt layer to below suit
 2015-09-25 11:45:57 +03:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-09-25 10:44:23 +02:00
Hubblenaut
8d3519e24b Belt layer below suit layer, belts toggleable 2015-09-24 17:48:14 +02:00
Chinsky
60a925422f Merge pull request #11167 from PsiOmegaDelta/150921-ColorCleanup 
Floor painter, turf, and decal tweaks.
 2015-09-24 15:27:58 +03:00
PsiOmega
de2e9e2d9a Odd typo fixes. 2015-09-21 20:31:47 +02:00
PsiOmega
38c0251b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-21 17:35:49 +02:00
PsiOmega
5b4c7340e4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-21 17:26:19 +02:00
PsiOmegaDelta
8a1b414e28 Floor painter, turf, and decal tweaks. 
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
 2015-09-21 15:14:13 +02:00
Zuhayr
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable 
Species tweaks
 2015-09-21 19:08:53 +09:30
Chinsky
5243626724 Merge pull request #11157 from PsiOmegaDelta/150920-ThunderdomeExclamationmark 
Map tweaks.
 2015-09-21 11:49:47 +03:00
Hubblenaut
ced4ce268c Adds Syndicate ID sprite 2015-09-20 21:11:49 +02:00
PsiOmegaDelta
4cc2b1a93e Glowy items. 
Energy shields now glows slightly stronger than stunbatons when active.
 2015-09-20 18:18:19 +02:00
PsiOmegaDelta
7d975aa36f Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-09-20 17:59:57 +02:00
PsiOmegaDelta
d891fba1cc Mob size tweaks. 
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
 2015-09-20 17:12:07 +02:00
PsiOmegaDelta
59c5807157 Active stunbatons now glow. 2015-09-19 21:12:19 +02:00
Hubblenaut
4eef7ab65d Fixes beds occasionally buckling in odd directions 2015-09-19 15:27:24 +02:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
GinjaNinja32
6a61269edd Merge pull request #11106 from Kelenius/jetpackFixes 
Fixes for jetpacks and gas tanks
 2015-09-15 15:06:58 +01:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
mwerezak
db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair 
Converts some loc = to forceMove()
 2015-09-14 12:11:09 -04:00
Kelenius
3c4369823f Fixes for jetpacks 
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
 2015-09-14 16:35:52 +03:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove() 
Fixes #11102.
 2015-09-14 11:13:15 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
 2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
 2015-09-13 10:44:06 +02:00
PsiOmega
0c21ef741e Fixes #10988. 
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926.
 2015-09-12 20:43:24 +02:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
Vivalas
ae5810d6ed Fixes #10729 2015-09-10 13:50:24 -05:00
mwerezak
f69c723d40 Made flares a bit brighter 2015-09-09 20:42:40 -04:00
mwerezak
8e66d3b31a Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon 
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
 2015-09-09 19:49:46 -04:00
PsiOmegaDelta
cbd621ae41 Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses 2015-09-09 08:18:26 +02:00
PsiOmegaDelta
6a956d0d0a Uplink fixes. 
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
 2015-09-08 08:43:40 +02:00
PsiOmegaDelta
23a3433e67 Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums. 2015-09-08 08:32:09 +02:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +02:00
PsiOmegaDelta
2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
 2015-09-08 07:58:25 +02:00
PsiOmega
0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr
88b95e1207 Fixes #7951 2015-09-07 14:40:23 +09:30
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade 
Adds fragmentation grenades
 2015-09-07 14:12:27 +09:30