cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 22:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,644 Commits 8 Branches 26 Tags
5bc64c3db3b0cefcd449feebd80aee048ac669c9
Commit Graph

551 Commits

Author SHA1 Message Date
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Whitellama
98e287bc6d Fixed xenobiologist having no preview clothes in character setup 2014-08-31 16:22:43 -07:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
JimTheCactus
e74d92370d Added a forced, immediate refresh of the icons after the character is made. 
This eliminates a race condition between spawning in and the icon cache being updated to include the body.
 2014-08-17 12:34:02 -06:00
Chinsky
658941a0f9 Merge pull request #5978 from Zuhayr/journalism 
Mining changes and basic character backgrounds.
 2014-08-14 10:54:49 +04:00
MrSnapwalk
6b44ef8ff1 Adds new hair. 2014-08-13 20:15:07 -05:00
Zuhayr
688cf22a67 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-08-13 17:10:37 +09:30
iamgoofball
88c034a30b Ports the "Family Man" Hair Pack from /vg/station. 2014-08-11 13:25:57 -07:00
Zuhayr
beaad5a37b Merged in preferences file changes, changed None to Unset for home system. 2014-08-11 10:38:01 +09:30
Zuhayr
9eefdf4db8 A bit of prep work for integegrating player-set backgrounds into gameplay. 2014-08-01 22:54:57 +09:30
Zuhayr
1bd8b7baf0 Added citizenship, faction, religion and home system to character generation. 2014-08-01 22:05:38 +09:30
PsiOmega
8104928e75 Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs. 
Fixes #5867 as well as a couple other missing verbs.
 2014-08-01 10:36:44 +02:00
Jarcolr
9e233f1597 Fixes #5691 
Chef >> Chefhat
 2014-07-26 13:41:43 +03:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
Chinsky
d59e5b8da2 Merge pull request #5603 from DJSnapshot/hotfix 
Changing URL of Corporate Regulations to the new Corporate Regulations
 2014-07-14 07:12:37 +04:00
Zuhayr
2c634a8d7a Fixes #5611 2014-07-14 12:00:15 +09:30
DJSnapshot
aa2ea04c27 space law -> Corporate regs in skills 2014-07-13 13:47:07 -07:00
Zuhayr
96bbe1d9db Added spawnpoint datum, moved existing latejoin spawn to datum setup. 2014-06-24 13:33:48 +09:30
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
Zuhayr
a6f64ccd9c Merge pull request #5330 from mwerezak/emergency-shuttle 
Updates emergency shuttle controller to use shuttle datums
 2014-06-23 21:19:36 +09:30
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
Loganbacca
63f9b93ab0 Preview icon render fix 
- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
 2014-06-22 13:05:41 +12:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
mwerezak
0a394fb59f Fixes tails not rendering on the player preview 2014-06-18 00:27:07 -04:00
paprka
7a28f5eea0 overeye 2014-06-14 21:04:05 -07:00
Hubblenaut
1e09995f63 Wheelchairs spawn on footless characters 2014-06-05 22:50:42 -04:00
Jeremy Liberman
dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Jeremy Liberman
c607872b80 Mutiny fix prereqs for directives 2014-05-25 14:20:37 -05:00
mwerezak
87dfeab0f3 Adds secondary languages for species 2014-05-22 16:17:52 -04:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Intercross21
1f261fdadd Fix for alien whitelist 2014-05-09 09:20:55 +04:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
suethecake
beea526685 Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors. 
Trying to color them while dark green and brown-grey ended up in odd colorations. Quality of life change.
 2014-04-27 04:05:55 -06:00
suethecake
2b2d64f05f Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY! 2014-04-27 01:00:16 -06:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Ccomp5950
e548fe6e43 Crash fix attempt: Moving NanoUI resource file sending away from client/New() 
it's going in mob/Login() instead.
 2014-04-25 17:47:27 -05:00
Ccomp5950
b2d03d67a0 Merge pull request #4819 from Mloc/bs12-itemorgans 
human: move organ generation into a species proc
 2014-04-25 15:33:34 -05:00
Ccomp5950
186e78d2cf Say code fixes. 
Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...
 2014-04-20 04:37:46 -05:00
Mloc-Argent
28a57a1029 human: move organ generation into a species proc 
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-04-18 10:44:21 +01:00
Ravensdale
45d82c2e00 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/modules/mob/living/say.dm
	maps/tgstation2.dmm
 2014-04-16 22:13:48 -07:00
Jarcolr
2ab200681b New IPC Faces - SparklySheep 
http://baystation12.net/forums/viewtopic.php?f=44&t=9840
 2014-04-14 11:30:29 +03:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -07:00
Segrain
fcc4560e92 Displaying delayed time. 2014-02-03 04:38:38 +03:00
Ccomp5950
0980493981 Merge pull request #4368 from Loganbacca/prefs 
Character setup underwear rendering
 2014-02-01 14:58:38 -08:00
Chinsky
3a913e426c Merge pull request #4360 from RKF45/dev 
I am doing that just for genetecists wearing monkey suits.
 2014-02-01 03:33:54 -08:00
Loganbacca
6bf6f6d849 Added underwear rendering to character setup screen 
Also culled unused underwear names from global_lists.dm
 2014-02-01 17:53:13 +13:00
RKF45
2be33b8713 Typo 2014-01-31 08:36:56 +01:00
RKF45
003dd117f2 New preferences 2014-01-30 22:27:47 +01:00