Commit Graph

582 Commits

Author SHA1 Message Date
Zuhayr
a3ed7fc033 Should fix the head and hair issues from the organ rewrite. 2015-04-03 05:41:33 -07:00
Zuhayr
84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03:00
mwerezak
9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-03-31 00:16:56 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
Zuhayr
8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
PsiOmega
2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
GinjaNinja32
04640eafb1 Fix issues with skill class procs 2015-03-20 22:47:51 +00:00
PsiOmega
cf11fad8bc Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-01 21:13:38 +01:00
PsiOmega
00becda446 Few Fixes.
Fixes #8304.
Fixes #8306.
2015-02-28 14:29:30 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Chinsky
3f8462a399 Adds a wardrobe structure to pick your underwear.
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
2015-02-16 11:17:22 +03:00
GinjaNinja32
6ea6c82897 AI latejoin 2015-02-02 17:59:57 +00:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
PsiOmega
c587c4d8b0 Ready-button consistency.
The Ready/Not Ready options during round now always set the ready flag as according to their name, rather than always toggle.
This prevents the case where (due to heavy load/no processing of dialogs during early client startup) the dialog claim one thing and the lobby status tab another.
2014-12-11 08:44:56 +01:00
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