Commit Graph

13438 Commits

Author SHA1 Message Date
Fox-McCloud ab16128e7c Updates Mining Loot Crates 2016-04-21 21:37:13 -04:00
Tastyfish 198656874d Fixes shuttle smoothing 2016-04-21 21:35:53 -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
TheDZD db2860aa86 Merge pull request #4253 from Meisaka/fixthelights
Fix the light toggles on drones and guardians.
2016-04-21 20:11:37 -04:00
TheDZD db74002aa2 Merge pull request #4248 from tigercat2000/fix_rigsuits_2016
RIGsuit fixes
2016-04-21 20:11:24 -04:00
KasparoVy 401f31643d Attaching a prosthetic head that isn't a monitor won't cause you to go bald & Fixes disembodied prosthetic heads being bald & ...
cont'd: Adds the rendering of markings on disembodied heads.
2016-04-21 19:59:11 -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
Fox-McCloud 3dd9a6d744 Updates Revolution 2016-04-21 06:36:35 -04:00
Meisaka Yukara 8cf5534a3d Make robot/silicon/pAI emotes sane again. 2016-04-21 15:35:01 +09:00
Meisaka Yukara e4b2f8d870 Fix the light toggles on drones and guardians. 2016-04-21 11:23:08 +09:00
HugoLuman 942dfd1feb Fixes compilation error
Removes extraneous (
2016-04-20 16:13:25 -07:00
Tigercat2000 1a53464a1c Make toggle_piece more robust 2016-04-20 16:02:07 -07:00
Tigercat2000 9917906834 RIGsuit fixes
- Replaced /proc/toggle_seals with /proc/unseal and /proc/seal
- You can no longer retract anything but the helmet after you seal the
  suit (what the fuck was the point of having the seal if it does nothing
  but make it latch onto your back)
- Clicking on parts and popping them off shouldn't be a thing anymore
  (hopefully)
- Rewrote some of the nasty toggle_piece code.
2016-04-20 15:40:16 -07:00
HugoLuman f75b8b86e4 Removes heat resist mutation check
In line with the recent adjustment to heat_resist mutation patch on the main branch
2016-04-20 15:27:22 -07:00
Fox-McCloud 552b02050a Merge remote-tracking branch 'upstream/master' into fixes-cold-heat 2016-04-20 18:06:03 -04:00
HugoLuman 33a89f2480 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Paradise-drask 2016-04-20 14:55:30 -07:00
HugoLuman 954cfb9e04 Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 2016-04-20 14:49:25 -07: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 507d6edf5e Merge pull request #4247 from Tastyfish/signaller
Fixes pda signaller radio
2016-04-20 17:34:21 -04:00
Tastyfish 99ba2e4bd2 Fixes pda signaller 2016-04-20 17:01:08 -04:00
Mieszko Jędrzejczak 36ae2782bb Lighters burn only your hand and lightbulbs don't burn at all 2016-04-20 22:52:48 +02:00
HugoLuman fbfc544792 Changes some comments to be more accurate
It's every 4 ticks, not seconds, The time in seconds is longer.
2016-04-20 13:01:37 -07:00
TheDZD 3dd4f16008 Merge pull request #4233 from Fox-McCloud/abduction
Abduction
2016-04-20 11:01:55 -04:00
Fox-McCloud 685e5c28ea Ports TG's Improved Attack Animations 2016-04-20 05:50:09 -04:00
HugoLuman f72b7f6d99 Adjusts breath regeneration values down
Tier 4 from 10 points to 8 points
Tier 3 from 6 points to 3 points (COLD_GAS_DAMAGE_LEVEL_3)
Tier 2 from 3 points to 1.5 points (COLD_GAS_DAMAGE_LEVEL_2)
Tier 1 from 1 points to 0.5 points (COLD_GAS_DAMAGE_LEVEL_3)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-20 02:28:40 -07:00
TheDZD 22f16ac13a Merge pull request #4219 from MarsM0nd/surgerytweak
Hemostat used again for embeded object removal
2016-04-19 19:21:20 -04:00
TheDZD 5df0a9afe4 Merge pull request #4221 from tigercat2000/tgalerts
-tg- screen alerts
2016-04-19 19:13:31 -04:00
Aurorablade 991976fbcb before tiger kills me... 2016-04-19 17:30:13 -04:00
Matt 8f4fd998a9 Fixes and prizes 2016-04-19 22:05:43 +02:00
Aurorablade d4d7535a1f kick punch 2016-04-19 16:01:03 -04:00
Mieszko Jędrzejczak 5e5a735845 Lightbulbs don't burn anymore. 2016-04-19 20:37:49 +02:00
Fox-McCloud 76cd925d75 last fixes 2016-04-19 01:34:54 -04:00
Fox-McCloud 8ff32f4566 fixes 2016-04-18 22:53:31 -04:00
Fox-McCloud 2954aa88ea abductor tech 2016-04-18 19:17:46 -04:00
Fox-McCloud 0fa40f4650 tweaks 2016-04-18 06:45:26 -04:00
Fox-McCloud 87a9f30bd4 Part 6 2016-04-18 05:32:41 -04:00
TheDZD 08708c7a17 Merge pull request #4226 from Tastyfish/wpai
Lets pAI's whisper consistently
2016-04-17 19:55:33 -04:00
monster860 fc09967ca8 telecomms concurrency fix 2016-04-17 17:14:46 -04:00
Fox-McCloud fe170db7bb part 3 2016-04-17 10:35:10 -04:00
TheDZD 66d44ddad4 Merge pull request #4207 from Fox-McCloud/syringe-qol
Syringe Injection QoL
2016-04-17 10:21:41 -04:00
Fox-McCloud 2453735d3f part 2 2016-04-17 00:21:31 -04:00
Fox McCloud 1d92a4f46b Merge pull request #4224 from Tastyfish/libfix
Fixes books being blank
2016-04-16 23:37:54 -04:00
Aurorablade 2d85f582e1 martial arts shit 2016-04-16 22:22:21 -04:00
Tastyfish 4151991e65 Lets pAI's whisper 2016-04-16 20:15:32 -04:00
Tigercat2000 88f3414d4c PoolOrNew is ugly, carbon trailing returns, oh my 2016-04-16 16:35:06 -07:00
Tastyfish dffa0c6e52 Fixes books being blank 2016-04-16 19:12:58 -04:00
Tastyfish 0820c03a18 Removes unnecessary extra stuff I did, makes bot radios cleaner 2016-04-16 18:36:21 -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