Commit Graph

731 Commits

Author SHA1 Message Date
Aurorablade
e7f612eda0 Adds Tajaran Veil Clothing Racial Item (#7225)
* Initial commit Squashed

* hideeyes

* false changes

* coverseyes
2017-05-06 15:44:59 -07:00
Fox McCloud
36d4298e2b Merge pull request #7198 from Crazylemon64/organ_varname_refactor
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-30 17:00:44 -04:00
Crazylemon64
34cb73f40b Forgot to qdel 2017-04-30 13:36:08 -07:00
pinatacolada
e52886734f bioluminescent kidan! 🐜 🏮 (#7137)
* bioluminescent kidan! 🐜 🏮

Gives Kidan an IC tab ability that makes them glow! wow!!!!!

This adds body and head markings, a new glowy organ to kidan lower body,
and glowing space ants! wow!!!!!!

Bioluminescence eats away nutriment, you can be glowing for some 13
minutes at roundstart before you starve out and the light goes out.
Dying also turns off the light. And shadowlings veil too.

Light color is based on a mix between head and body markings colors,
where the body markings color is slightly more predominant.

How bright you are depends on how much clothing you have. A full nakey
kidan is as bright as a flashlight, while a fully suited kidan isn't
bright at all. Rolling down jumpsuits makes you more bright too. Basic
idea is less clothes in the way, more brightness.

Oh you can also remove the light organ and implant it on other things,
and they will gain the ability to be bioluminescent. Yes you can be a
hot pink glowing neon green in the dark vulp. If you implant the organ
on someone else, the light will be based on the original kidan's colors.

kudos to Traveling Merchant for the sprite work, and KasparoVv for
helping me out with the markings part. Only one set of body markings is
done yet, but hey they're easy to make

🆑 pinatacolada, Travelling Merchant
add: Glowing kidan!
add: Kidan body markings
🆑

* address all the things

literally everything

* fixit

* death comes

* death goes

* i ded

* all the small things
2017-04-29 23:31:27 -07:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Fox McCloud
d60911a335 Merge pull request #7070 from Kyep/version_update
Updates suggested client version from 510 to 511
2017-04-27 01:02:42 -04:00
Tigercat2000
a7506f0aa6 Add config option to completely disable karma 2017-04-21 17:06:43 -07:00
Crazy Lemon
fc1e84f042 Merge branch 'master' into make_paradise_great_again 2017-04-21 11:32:47 -07:00
Kyep
b6b35f2be9 fixes merge conflict 2017-04-21 00:40:38 -07:00
CoreyLee Hassell
4691cd9f32 Default Alternate Job Preferences Adjustment
This changes the default alt job setting to return players to the lobby
if their job preferences are unavailable.

Reasoning:
- Random jobs should be an opt in, not an opt out, feature
- Typically,
new players can overlook this option or misunderstand what it means, and
end up in roles they may not have prepared themselves for.
- Being assigned a job that a person absolutely does NOT want means its
far less likely they will even do their job. We can only hope they cryo
in such cases. I'd rather just address one potential source of issues.

Potential cons:

- Might slightly reduce filling the less desireable jobs, but I think
the pros far outweight the cons.

This has NO effect on existing players, unless the admins decide to run
an SQL query. This ONLY affects new players.

🆑
Tweak: Default Alternate Job Preference changed to "Return to Lobby".
Only affects new players.
/🆑
2017-04-20 00:58:44 -04:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Xantholne
56f4b1ca7a Fixes missing CMO Skirt path 2017-04-18 23:35:55 -06:00
Xantholne
b4044b7dd7 Changes beret color to a medical doctor uniform white. Removes certain jobs that probably wouldn't be given one as well. Also updates the flavor text to not be about a blue beret. 2017-04-14 08:13:42 -06:00
Xantholne
991f331aaf Adds Medical beret available via loadout 2017-04-12 23:50:07 -06:00
Kyep
b3f6c8ce54 Updates suggested client version from 510 to 511 2017-04-07 23:05:46 -07:00
monster860
7d0f5cb400 Fixes
- Makes it so that log_client_to_db is called before mob/Login()
- Makes it so can_vote() doesn't runtime if the player_age isn't a number
2017-04-04 18:50:24 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
KasparoVy
d8d95b6fd0 Kidan Antennae/Greyscaled & Darkened Skrell 2017-03-19 03:55:50 -04:00
Crazy Lemon
4e9236090e Merge pull request #6776 from FlattestGuitar/shoes
Ports tg's winter boots 👞
2017-03-16 17:46:27 -07:00
Markolie
31e10b1b07 Flavor text fix, disabilities window popup 2017-03-16 23:51:46 +01:00
Markolie
e2a30cc7fe Preference, changeling and record fixes 2017-03-16 23:39:26 +01:00
FlattestGuitar
603668fb23 Adds winter boots; adds workboots to the loadout system 2017-03-15 19:45:40 +01:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Fox McCloud
d6da6e3f52 Merge pull request #6527 from davipatury/modular_computers
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
Krausus
a803500489 Fixes admin bwoink preference
Non-admin players no longer get the (unusable) verb to toggle it, nor is
its setting respected when PMing them
2017-03-10 19:46:35 -05:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
davipatury
781e66ec52 Fix conflicts. 2017-03-08 12:57:45 -03:00
Mark van Alphen
b26d50d9f9 Merge branch 'master' into findnreplace 2017-03-08 10:37:10 +01:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
2017-03-07 22:25:11 -05:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
davipatury
af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
FlattestGuitar
14bc738ca3 Adds confirmation thingies to karma purchases 2017-03-02 20:36:49 +01:00
Crazylemon64
6ec6c90aad Allows IPCs to express themselves as a gender again 2017-02-26 12:06:16 -08:00
Crazylemon64
26bfc2c1b7 Removes IPC gender 2017-02-25 22:49:36 -08:00
monster860
c044f0aa44 Player Polls Revamp 2017-02-25 18:54:06 -05:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
davipatury
bfc130dafb Base. 2017-02-19 21:54:46 -03:00
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Tigercat2000
e7023fd032 Refactored 'select equipment' to use outfit datums
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00
Tigercat2000
14ba6fded6 Ported /tg/'s outfit datums, refactored job controller to support them
Players:
 - The only thing that you should notice is that your backpack options
 have changed. Instead of being "None", "Backpack", "Satchel", and
 "Satchel Alt", there are 6 options:
   - "Grey Backpack": Ensures you always recieve a plain grey backpack.
   - "Grey Satchel": Same as the above, grey, plain, satchel.
   - "Grey Dufflebag": So you don't have to rush the locker room, I
   guess. Just kinda ransacked it from /tg/. Happy to revert it, please
   do not post a five paragraph text wall calling me a shitlord
   powergaming hitler-loving furry.
   - "Leather Satchel": It's a leather satchel. What the hell did you
   think it was?
   - "Department Backpack": Gives you the department's default backpack.
   Grey for most jobs.
   - "Department Satchel": It gives you the department's default
   satchel; A grey satchel if the department doesn't have one.

Coders:
 - The above means this needs a minor SQL change:
   ```
   SQL goes here
   I'll write a query later
   Can't be bothered now
   Kill me please
   ```

 - This is a cleaner method of handling job equipment than
 "M.equip_or_collect" x 1000. Jobs specify a '/datum/outfit' datum,
 which defines all of the things to equip to the user.

 - Minor note: equip_or_collect will no longer ever generate a plastic
 bag. It will instead just drop stuff on the floor if it can't stuff it
 into a mob. If this is even slightly a point of contention, more than
 happy to revert it; It was just requested by Fox.
   - Addendum: This also has the effect of making it so that labcoats
   are just thrown onto the floor if you have a loadout suit. It's not
   really avoidable. Uniforms and suits are equipped before the
   backpack.

 - Changes from /tg/:
   - Changed all of the "H.equip_to_slot_or_del" calls into invoking a
   new "equip_item" proc; This is used to support a new variable called
   "collect_not_del". Job outfits use this, it makes it so that the
   system calls equip_or_collect instead of equip_to_slot_or_del. The
   idea being that job items should never be lost to the void,
   especially because they can conflict with loadout items.

TODO:
 - Retrofit "Equip Mob" verb to use this for all of the non-job options
 - Fully implement head announcements(?)
   - May be best for a second PR that addresses all of the real issues
   with our current job system

( Now go reread that SQL code block :) )
2017-02-17 11:35:45 -08:00
Crazy Lemon
96afaca62c Merge pull request #6293 from KasparoVy/deadchat-anon-pref
Makes Deadchat Anonymity Persistent as a Preference
2017-02-14 20:54:27 -08:00
Crazy Lemon
1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools
Goonchat Admin Filters
2017-02-14 13:09:24 -08:00
KasparoVy
46158e7854 conflict resolution 2017-02-13 06:35:17 -05:00
Fox McCloud
300751373d Merge pull request #6280 from fludd12/Grey-Wingdings
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
Fox McCloud
5953b527c0 Merge pull request #6398 from tigercat2000/game_pref_fix
Fix window flashing not saving to SQL & Add error logging to log_client_to_db
2017-02-13 06:18:20 -05:00
Markolie
f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
Crazylemon64
6718d49af9 Fixes client varedit 2017-02-11 13:40:45 -08:00