Commit Graph

551 Commits

Author SHA1 Message Date
Tigercat2000
d927504dc1 Fix compile, Add job restriction column, make job skirts betterish
Job skirts now only cost 3 points, any further job skirts selected will
not count towards points. Yes, you still spawn with multiple skirts if you
are in a position that has them, no, I can't fix it.
2016-06-13 21:03:58 -07:00
Tigercat2000
d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
2016-06-13 20:11:29 -07:00
Fox-McCloud
b2040467bd Fixes Databaseless Operation Runtime 2016-06-12 03:53:26 -04:00
Krausus
c5fc47eca4 Fixes repeated database reconnections
setup_database_connection resets the database connection each time it's
called, and was being called for each new client
2016-06-07 05:05:02 -04:00
Matt Milosevic
49d7390614 Tweaks some things regarding the change notification 2016-05-31 12:52:56 +02:00
Fox McCloud
5395a0515d Merge pull request #4365 from CrAzYPiLoT-SS13/changelog_change
Adds unread changes notification
2016-05-25 19:24:44 -04:00
Tigercat2000
07e5957645 TWEAK METADATA UNFINISHED 2016-05-15 20:03:29 -07:00
Tigercat2000
e91bd14fc6 Bay/Polaris loadouts
Basics
 - Allows you to select up to 10 items in the character menu
 - Saved per-character
 - The items will be spawned when you join
 - Some items may have job limitations

Included Items
 - Accessories
   - Scarf
   - Black Scarf
   - Christmas Scarf
   - Dark Blue Scarf
   - Green Scarf
   - Light Blue Scarf
   - Orange Scarf
   - Purple Scarf
   - Red Scarf
   - Striped Blue Scarf
   - Striped Green Scarf
   - Striped Red Scarf
   - White Scarf
   - Yellow Scarf
   - Zebra Scarf
 - Cosmetics
   - Blue lipstick
   - Jade lipstick
   - Purple lipstick
   - Red lipstick
 - General
   - d20
 - Uniforms and Casual Dress
   - Blue Plaid Skirt
   - Purple Plaid Skirt
   - Red Plaid Skirt
   - Atmospherics Skirt
   - Black Skirt
   - Cargo Skirt
   - Chemist Skirt
   - CMO Skirt
   - Engineer Skirt
   - HOS Skirt
   - Medical Skirt
   - QM Skirt
   - Roboticist Skirt
   - Scientist Skirt
   - Security Skirt
   - Virologist Skirt
   - Warden Skirt
2016-05-11 13:00:23 -07:00
KasparoVy
13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
Tastyfish
a421a6dd3a Makes Load Slots dialog come up on top of Character Preferences 2016-05-09 20:34:23 -04:00
Tigercat2000
ab872ff2f8 move flavor text below nt relation 2016-05-07 09:30:48 -07:00
Tigercat2000
1ca3ac3e7a More preference menu organizing 2016-05-07 09:25:24 -07:00
Tigercat2000
7c2d6b7cb9 Preference Screen Overhaul
Reorganized the character preference screen.
2016-05-07 08:50:12 -07:00
Matt
24d5a2cf4e Whoops 2016-05-05 23:20:03 +02:00
Matt
3ce6965599 Quick fixes 2016-05-05 20:04:59 +02:00
Matt
c2ce4d1a95 Adds unread changes notification 2016-05-05 19:29:01 +02:00
KasparoVy
f95655419c Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1
Also fixes a typo or two.

TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
2016-04-30 08:12:41 -04:00
HugoLuman
c7d2359a1f Moves Drask to the end of the species list
Puts them in proper numerical order in client procs.dm
2016-04-29 14:08:11 -07:00
HugoLuman
6285d42236 Fixes the karma buy order in client procs.dm
Hopefully this won't rearrange what species people have unlocked now
2016-04-28 18:59:53 -07:00
HugoLuman
5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask
# Conflicts:
#	icons/mob/human_face.dmi
2016-04-26 17:32:04 -07:00
TheDZD
8488c976e8 Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR
Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
2016-04-26 19:15:19 -04:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE
-tg- HUD styles
2016-04-25 19:57:59 -04:00
TheDZD
f65910c3d9 Merge pull request #4274 from tigercat2000/attackpref
#4243 preference option
2016-04-25 18:34:48 -04:00
TheDZD
cdc20258a1 Merge pull request #4212 from Tastyfish/bans
Cleans up special role jobbans
2016-04-25 18:34:37 -04:00
Fox McCloud
e7bb8c22cc Merge pull request #4220 from CrAzYPiLoT-SS13/chess_ma_dudes
Adds SpessChess!
2016-04-23 21:05:53 -04:00
Tigercat2000
d08cb0db9c Adds a preference setting to the "ghost item attack" thing 2016-04-23 17:31:52 -07:00
Tigercat2000
0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
KasparoVy
6b73c047c5 Fixes Runtime
Occurred when trying to list hair, marking or facial hair styles in
situations where the head is the default Morpheus head (no replacement
head).
2016-04-21 22:23:09 -04:00
KasparoVy
698f81cefc Fix - Main Entries in Primary Choice Only
Ensures the first choice posed to the user is one of companies that only
offer one model and single entries for companies that offer more than
one model
2016-04-21 20:42:30 -04:00
KasparoVy
3b435c023a Refactor scissors, fix and finalize prefs, fix missing part definition for xion models, etc.
continued: Monitor changing verb will now only show a list of monitor
styles available for the monitor head brand you are using.

For example, if you chose any of the regular monitor heads (default
morpheus or anything suffixed with mtr.) you will get a list of IPC
standard monitor styles and nothing else.
However, if you chose the hesphiastos alt head (which is also a monitor,
but of a different style) the list will be populated with the monitor
styles suitable for that hesphiastos head, but none others (not even the
ipc standard ones, since those don't fit and hesphiastos alt. isn't in
the models_allowed list)
2016-04-21 19:59:09 -04:00
KasparoVy
6398e9c3fe Pass2 2016-04-21 19:58:38 -04:00
KasparoVy
a9ee7ea97e PASS 1
TO DO: SCISSORS AND SHAVER REWORK
2016-04-21 19:58:37 -04:00
HugoLuman
18aaaa9366 Resolves conflict in interface/stylesheet.dm
The new stylecolor for Abductors used the same line as the Drask's

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-20 14:44:24 -07:00
TheDZD
3dd4f16008 Merge pull request #4233 from Fox-McCloud/abduction
Abduction
2016-04-20 11:01:55 -04:00
Matt
8f4fd998a9 Fixes and prizes 2016-04-19 22:05:43 +02:00
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Tigercat2000
aa3b7ac678 -tg- screen alerts
A lot has changed.

Major points:
 - All mobs now use the -tg- thrown alerts system. This is a system where
   a maximum of 5 "alerts" (which take the apperance of HUD icons like the
   inventory and modular action buttons) on their HUD.
 - Alerts are defined as a subtype of /obj/screen/alert.
   - Alerts are "thrown", or activated on the mob with the proc
     `mob.throw_alert("alert_id", /obj/screen/alert/path, severity
     (optional), new_master (optional, overlays the referenced "obj" on the
     button))`
   - Alerts are cleared by calling `mob.clear_alert("alert_id")` or by the
     /obj/screen/alert containing a `timeout` setting, which will
     automatically clear itself after that period of deciseconds.
   - Alerts may have functionality beyond appearance: Mousing over them
     will use the WireWraith tooltip system to generate a themed tooltip,
     and clicking them may have a function defined on the
     /obj/screen/alert object.
   - Shift-clicking an alert will give you it's name and status, in case
     the tooltips fail to work.

 - Hunger/Oxygen/Toxin/Nitrogen/Pressure/Etc warnings are now handled via
   the -tg- thrown alerts system.
   - Failing to breathe anything will display as an "No O2" warning.
   - Species breathing has been refactored to accomodate this. Vox are
     able to breathe the station air without instantly dying, but will be
     poisoned every time they breathe by the oxygen in the air. Any
     species with a unique gas breathing type will also display the
     correct "Choking (no X gas)" instead of just "oxygen". (Unless they
     have not breathed anything in, it's a quirk.)
   - Robot cell/temperature alerts also use this.
   - Aliens, though not harmed by toxins, will have an alert if they
     breathe in toxins, notifying them that "You'll be toast if this
     lights up."

 - More alerts have been added
   - Buckling
     - Activated on: Being buckled to an object.
     - Cleared on: Being unbuckled.
     - Click functionality: Calls resist(); Will unbuckle from chair
       instantly if unrestrained, otherwise, there is a delay period.
   - Hand/Leg cuffs
     - Activated on: Being handcuffed.
     - Cleared on: Being unhandcuffed.
     - Click functionality: Calls resist(); Will attempt to either get out
       of the handcuffs, or, if you are a xenomorph or hulk, break the
       handcuffs in 5 seconds.
   - Blind/High
     - Activated on: Becoming blinded/becoming high on LSD.
     - Cleared on: Becoming unblinded/the high wearing off.
     - Click functionality: None.
   - Asleep
     - Activated on: Life() tick detecting sleeping.
     - Deactivated on: Sleeping being 0 or less.
     - Click functionality: None.
   - Weightless
     - Activated on: Losing gravity.
     - Deactivated on: Moving back into an area with gravity.
     - Click functionality: None.
   - On Fire
     - Activated on: Catching fire.
     - Deactivated on: Being extinguished.
     - Click functionality: Calls resist(); Causes you to stop, drop, and
       roll, which will reduce firestacks and possibly extinguish you.
   - Law update (BORG ONLY)
     - Activated on: Laws being changed.
     - Deactivated on: Timer, 300 deciseconds.
     - Click functionality: None.
   - Hacked (BORG ONLY)
     - Activated on: Being emagged/given malf tools by the malf AI.
     - Deactivated on: Emagged status being removed.
     - Click functionality: None.
   - Locked (BORG ONLY)
     - Activated on: Lockdown being set (by emag law rewriting/robotics
       console/wire being destroyed)
     - Deactivated on: Movement being unlocked.
     - Click functionality: None.
   - Notify Cloning (GHOST ONLY)
     - Activated on: A human's body being placed in a DNA scanner.
     - Deactivated on: Timer, 300 deciseconds.
     - Click functionality: Reenters body.
   - Notify Jump (MULTIPURPOSE) (GHOST ONLY)
     - Activated on: Any sort of chance to become a mob (ie, golem rune).
     - Deactivated on: Timer, 300 deciseconds.
     - Click functionality: Varies.
2016-04-16 14:27:03 -07:00
Matt
0b0ce96ddb Adds SpessChess! 2016-04-16 19:44:55 +02:00
Tastyfish
127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
HugoLuman
8cf7e5af84 Adds the rest of the karma code
(Hopefully)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 16:12:46 -07:00
HugoLuman
12aa256a38 Adds karma/whitelist code
This makes them a 30 KP shop option, but could be altered to 45 KP without having to move their place on the list.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 15:22:47 -07:00
HugoLuman
4d0792e020 Gives Drask skin tone and makes it choosable in the character menu
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-13 15:23:55 -07:00
HugoLuman
03323686d4 Drask files
Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-12 19:00:29 -07:00
Fox-McCloud
e1d057ab0e Fixes Blind Player Preference Doing Nothing 2016-04-12 03:21:39 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
Tigercat2000
0a44d41005 Change max character slots to 20 2016-03-28 08:57:42 -07:00
Fox McCloud
3a9588b1e6 Merge pull request #3960 from Crazylemon64/various_appearance_fixes
Appearance Refactor
2016-03-23 11:22:32 -04:00
Crazylemon64
c641ab73f2 Fixes DNA and copy_to appearance, and some round-start IPC hair runtimes 2016-03-23 04:44:05 -07:00