cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 9 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

564 Commits

Author SHA1 Message Date
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
Chinsky
366badb706 Merge pull request #7165 from PsiOmegaDelta/Joining 
Late-Join Name Addition.
 2014-11-30 00:56:42 +03:00
PsiOmega
2f739975db Late-Join Name Addition. 
When late-joining the name of the currently loaded slot is shown at the top of the job selection screen.
 2014-11-28 20:31:26 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it. 
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
 2014-11-28 13:05:26 +01:00
Amunak
3e6ebe5d4c Main menu should now be big enough to not display a scrollbar. 2014-11-28 10:12:52 +01:00
Amunak
9103b98982 Cosmetic changes to the menu ready button. 
It works like a toggle switch now.
 2014-11-28 10:11:32 +01:00
mwerezak
e6b5d4cf77 Skrell icon/appearance changes 
Adds desaturated skrell body and hair sprites, fixed colour skrell eyes,
and blood colour as requested by Searif.
 2014-11-20 13:10:42 -05:00
GinjaNinja32
d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
GinjaNinja32
a725526e4a Fix cyborg latejoining, allow mid-round joining 2014-11-14 23:38:08 +00:00
GinjaNinja32
c5bba7f3a5 Re-move resource update 2014-10-20 17:26:55 +01:00
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Akai Alonkai
4c5665d4fd Add round start check to Declare Ready 
Added a check to 'declare ready' to prevent readying up after the round
started. Allowing this to happen caused a bug where the player would be
unable to change their character setup if they declared ready after the
round started, such as to look at the manifest to see which character
would be best to play, until after reconnecting.
 2014-10-01 06:16:29 -04:00
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