cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,232 Commits 94 Branches 23 Tags
TGSDMAPI
Commit Graph
364 Commits
Author SHA1 Message Date
Ccomp5950 c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-02-26 09:34:38 -06:00
Segrain fd738a5767 Smallfix. 2014-02-22 06:54:48 +03:00
DJSnapshot 009b4737af fix for semi-annoying typo. 2014-02-15 23:54:32 -08:00
DJSnapshot 3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Zuhayr a96c17fd75 Mixed up some whitelist flags. 2014-01-07 20:53:42 +10:30
Zuhayr 2a2fffc616 Fixed a duplicate definition bug with WHITELISTED. 2014-01-05 23:36:16 +10:30
Fira de7c480439 Added GhostRadio -- Allowing ghosts to spy on radio from anywhere 2014-01-04 12:25:09 +01:00
Chinsky ee6a18d94d Adds White UI to selectable UIs 2013-12-24 23:05:41 +03:00
volas 6841906228 Custom UI 2013-11-30 15:10:42 +04:00
DJSnapshot 8813123997 added config flags for objectives being enabled or disabled. 
added antag options menu.
added ability to choose where a syndicate uplink is installed.
 2013-11-29 17:02:23 -08:00
Nanai 2416ae715c Full Eye and Robot Organ Implementation 
Tested work to implement eyes ad internal organs and the charpref selectable robotic organ replacements for heart and eyes, both for assisted and fully mechanical variants!
 2013-11-14 13:08:29 -05:00
Chinsky 463adc446f Fancy ghosts! 
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
 2013-10-06 16:10:47 +04:00
Zuhayr 0dba5c14b4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-28 20:40:19 -07:00
Erthilo 7a319904e4 Reverts gender checks as it was breaking with NEUTER and breaking facial hair. 2013-08-27 22:51:24 +01:00
Zuhayr 9565c94955 Secondary language fix. 2013-08-27 00:10:00 -07:00
Segrain e85ddd3b9a Fix for unisex hairstyles. 2013-08-25 09:27:05 +03:00
Erthilo d7fc84b42b Better gender checks. 2013-08-21 09:59:07 +01:00
Erthilo de6eb16e1a Fixes being able to have alien species hair on humans or other species. 2013-08-20 10:37:05 +01:00
Zuhayr 9e58d93fd6 Removing snowflake checks for Soghun. 2013-08-16 01:01:12 -07:00
Zuhayr f6a562e8ed Couple of typos. 2013-08-14 09:47:52 -07:00
Zuhayr 45a26fcad9 Removed a debug string. 2013-08-14 02:19:36 -07:00
Zuhayr e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr 254cef453a Added a preferences switch for diona. 2013-08-13 14:16:07 -07:00
Zuhayr 82a4dedf5d Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD. 2013-08-12 21:17:38 -07:00
Zuhayr bc4ac1d4ee Language choice changes. 2013-08-10 21:00:15 -07:00
Zuhayr b5d89b8929 Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn. 2013-08-07 01:16:38 -07:00
Zuhayr 168e334abd Added BE_RAIDER pref to player setup and adjusted vox min player counts away from local testing values. 2013-07-28 06:05:22 -07:00
Peter Wall 5e91c569cc Made always random name respect gender 2013-07-27 10:09:58 +02:00
Jamini 920b855f6c Added employment records. 
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.

Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-07-24 22:23:50 -04:00
Mloc-Argent c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01:00
Mloc-Argent cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
Whitellama 6d8654eb7a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-30 20:02:36 -07:00
ZekeSulastin 9a8b9bcc60 Added secondary language to char setup 
This allows for one secondary language to be selected per character.
Whitelisting is done in alienwhitelist.txt via ckey; language options
are specified by ckey - Language_Species, with Soghun for Unathi as with
the normal whitelist.
 2013-06-29 17:31:21 -04:00
Whitellama 90eaca1e53 WIP Ninja GM junk 2013-06-26 16:30:24 -07:00
Zuhayr b41b1fc2f3 Armalis simple_animal/sprite. 2013-06-15 04:09:49 -07:00
NicholasDV a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Kilakk bde37882ce Fixed a small spelling error in job prefs 2013-06-11 21:36:40 -04:00
Kilakk 333163dc01 Reconfigured the job prefs panel to look nicer 
Thanks Deccy for pointing out a one pixel difference
 2013-06-10 21:45:50 -04:00
Zuhayr 06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
VitrescentTortoise aa68ac375a Edited changelog, made small edit. 2013-05-26 19:00:55 -07:00
VitrescentTortoise d0d51222e1 Allows players to return to lobby if job prefernces unavailable 2013-05-26 18:18:41 -07:00
Spamcat 0fb651e873 Fixed glasses 
Fixes #2742
 2013-05-16 00:11:57 +04:00
Ravensdale 754057cd09 hopefully disables glasses, unable to replicate bug. 2013-05-10 17:39:59 -07:00
Spamcat f7f6c682cf Made nearsightedness not consume a fuckton of memory. 
Also it now adds glasses on preview pic.
 2013-05-03 23:58:56 +04:00
DarkTechnomancer 99503c5542 Imported the option to start nearsighted and give glasses to those who do. 2013-04-28 22:45:15 -04:00
Zuhayr 1fe4cbb619 Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed. 2013-02-20 00:24:26 -08:00
cib 863a9deb7b Added NT relation preference. 2013-02-09 17:55:53 +01:00
Chinsky 566ef61c23 Made blood type selectable in preferences again. 2013-01-30 01:31:37 +04:00
Cael_Aislinn 7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 01:02:27 +10:00
Cael_Aislinn bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00