Commit Graph

6813 Commits

Author SHA1 Message Date
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
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
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
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
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
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
5df0a9afe4 Merge pull request #4221 from tigercat2000/tgalerts
-tg- screen alerts
2016-04-19 19:13:31 -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
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -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
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
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
TheDZD
5b05d80ff7 Merge pull request #4098 from Fox-McCloud/pai-is-kill
Removes PAI Control of Security Bots
2016-04-15 22:04:39 -04:00
Tastyfish
127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
Fox-McCloud
afddc2d8f1 Fixes+Cleans Up Cold+Heat Resist Mutations 2016-04-15 00:38:44 -04:00
TheDZD
9fe7fe91f2 Merge pull request #4192 from Fox-McCloud/genetics-fixes-tweaks
Genetics Fixes and Tweaks
2016-04-14 22:25:35 -04:00
Fox McCloud
0a5972b9ba Merge pull request #4116 from TheDZD/NOTTHEBEES
It's the Bees!
2016-04-14 21:27:01 -04:00
TheDZD
8a64637c9e Merge pull request #4160 from Aurorablade/DammitScience
This is why we can't have nice things
2016-04-14 21:03:03 -04:00
TheDZD
821f8b244a Merge pull request #4198 from Fox-McCloud/dropper-paste
Remove Dropper Copy-Paste
2016-04-14 20:50:38 -04:00
TheDZD
341034e37d Refactors hostile mob code, unsnowflakes bears, panthers, and snakes
Also fixes some bee stuff.
2016-04-14 20:36:45 -04:00
TheDZD
bb1caa4eea Instances loc setting should now all 🐝 changed to forceMove() 2016-04-14 20:30:34 -04:00
TheDZD
d88711cd8e Removes old bee file and fixes seed datum modification 2016-04-14 20:30:33 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Fox McCloud
f9a74914e2 Merge pull request #4173 from KasparoVy/head-accessory-fix
Head Accessories No Longer Hidden by BLOCKHEADHAIR
2016-04-14 20:22:00 -04:00
TheDZD
985ab85aae Merge pull request #4188 from Fox-McCloud/diona-refactor
Diona Species Behavior Handling Refactor
2016-04-14 19:17:17 -04:00
TheDZD
d95102b007 Merge pull request #4158 from Fox-McCloud/killer-tomato
Killer Tomatoes Live Up to their Name
2016-04-14 19:12:34 -04:00
TheDZD
f1672d6ccb Merge pull request #4156 from Fox-McCloud/mining-bot-update
Mining Bot Updates
2016-04-14 19:10:26 -04: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
bfcebf8044 Adds Orluum to silicon dms, fixes random skin tone
Also, butt sprites

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 14:40:25 -07:00
Fox-McCloud
4e04570a12 Remove Dropper Copy-Paste 2016-04-14 04:27:16 -04:00
Fox-McCloud
d2827a4196 Fixes Prescription Glasses 2016-04-14 03:55:50 -04:00
HugoLuman
56ec95fe00 New color, Regen refactor
Regen tiers all shifted up by one
Previous tier 3 rates now tier 4, even harder to reach
Drask language now has its own color
(Bugged commits retconned)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-14 00:15:40 -07:00
HugoLuman
498e243f0f Drask burn_mod down from 4 to 2. Now it takes 5 laser shots to kill them, or 8 welder hits
Regen values altered to reflect that change in the maths:
Tier 3 regeneration: 10 brute and 10 burn per breath (once every four seconds)
Tier 2 regeneration: 6 brute and 6 burn per breath
Tier 1 regeneration: 3 brute and 3 burn per breath
Tier 3 regeneration now requires an upgraded freezer to get internals cold enough
hot_env_multiplier = 2 added

Signed-off-by: HugoLuman <qaggeler@uci.edu>
2016-04-13 20:07:00 -07:00
Fox-McCloud
9005622ea7 Genetics Fixes and Tweaks 2016-04-13 21:21:52 -04: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