Commit Graph

1014 Commits

Author SHA1 Message Date
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions
Hit reactions
2016-07-09 18:30:37 -04:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
Fox McCloud
33c4d852f8 Merge pull request #4904 from TullyBurnalot/CardboardCoffins
Resisting out of cardboard boxes is now possible
2016-07-08 18:24:18 -04:00
Fox McCloud
4f8de18cb9 Merge pull request #4936 from Twinmold93/materialconsistencies
Grille  Inconsistency Fix
2016-07-08 17:59:23 -04:00
Fox McCloud
4897a52dc5 Merge pull request #4926 from TullyBurnalot/ComfyChair
Fixes Comfy Chair Deconstruction
2016-07-08 13:14:51 -04:00
TullyBurnalot
e0118efead Fixed Fox's suggestion
- Removed needless code
2016-07-08 12:03:38 +01:00
Twinmold
cd7ffd058b Grille Inconsistency Fix
This fixes an inconsistency when you use wirecutters on a destroyed
grille. Instead of giving 1 like it should, it gives two.

🆑 Twinmold
Fix: Fixes the inconsistency of getting 2 metal rods when you wirecutter
a destroyed grille down to 1.
/🆑
2016-07-08 03:29:16 -05:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot
0b94dc3a54 Fied Tiger's recommendations
- Removed needles src. Again.
- Replaced  istype(W, /obj/item/weapon/wrench) with iswrench(W)
2016-07-08 03:03:37 +01:00
TullyBurnalot
adab2c06e0 Fixes Comfy Chair Deconstruction
- Deconstructing Comfy Chairs now yields 2 metal sheets
2016-07-08 02:49:15 +01:00
TullyBurnalot
9793fc4b18 Resisting out of unwelded lockers is now possible
Fixes #4880. Sorta.

- Can now resist out of unwelded lockers instantaneously
- By association, can now resist out of closed cardboard boxes

You can also use Toggle Open, this is just faster.
2016-07-06 21:22:28 +01:00
Fox-McCloud
119c76ab0e Faster Get Turf from VG 2016-07-05 02:40:05 -04:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance
TG Armor Rebalance
2016-07-02 19:26:41 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Tigercat2000
567e1576f5 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences_toggles.dm
2016-06-30 17:40:10 -07:00
Fox-McCloud
2df7ff16d8 Fixes Sound/Debug Preferences 2016-06-30 10:57:58 -04:00
Tigercat2000
82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
2016-06-27 08:20:49 -07:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
Aurorablade
b93fef2369 snek? snek?! SNEEEKEKKKKKK!!!!! (#4759)
* snek? snek?! SNEEEKEKKKKKK!!!!!

* PLANT ops
2016-06-24 11:30:54 -04:00
TheDZD
7c602b5e54 Merge pull request #4743 from FalseIncarnate/bug_fix
Stool-fu
2016-06-24 08:32:07 -04:00
FalseIncarnate
42e624cb39 4 character commit
really.
2016-06-23 21:09:08 -04:00
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
TheDZD
5e2d7920c7 Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots
Engineer Workboots
2016-06-22 14:03:04 -04:00
FalseIncarnate
fef4ae6c0c Stool-fu
Stools can once again be picked up during impromptu bar brawls. Show
them who the real tough-guy is!

🆑
bugfix: To save on adhesive costs, Nanotrasen has stopped gluing stools
to the floor. The resulting bodily injuries probably won't cost more.
/🆑
2016-06-21 19:09:16 -04:00
Tigercat2000
5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
2016-06-19 16:28:57 -07:00
TheDZD
931f25c5f4 Makes it so lockers are no longer a safe place to hide from Lord Teslaloth (#4704) 2016-06-19 14:28:08 -04:00
FalseIncarnate
ae70a7fc69 Bug Fixes (#4714)
* Bug Fixes

Fixes #4616
- All ladders are now anchored and cannot be dragged, including dive
points.

Fixes #4663
- Trying to fill a full container from a toilet will inform you the
container is full, and thus fail.

Fixes #4705
- Being gibbed/dusted/melted will unbuckle the victim prior to their
gruesome fate, allowing their spirit freedom to no longer haunt the
buckles that bound their mortal form.

* Because apparently we shouldn't trust people to use "delete" properly
2016-06-19 13:24:58 -04:00
TheDZD
4df4b58bc1 Merge pull request #4687 from Fox-McCloud/crouching-warden-hidden-greytide
Gives Warden Krav Maga Gloves
2016-06-19 13:13:11 -04:00
SamCroswell
cbcf30335f Boots for Atmos Techs! 2016-06-18 22:17:16 -04:00
SamCroswell
3e25608535 Engineer Workboots 2016-06-18 22:08:59 -04:00
DaveTheHeadcrab
0c12ef1c0a Security Armor Update (#4660)
* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Sec Armor Update
2016-06-17 11:17:56 -04:00
Fox-McCloud
b89364e1df Gives Warden Krav Maga Gloves 2016-06-15 17:15:58 -04:00
Tigercat2000
599527a480 Add skirts to wardrobe lockers. 2016-06-13 21:13:10 -07:00
TheDZD
de7bf10447 Merge pull request #4620 from Fox-McCloud/mai-tables
Nerfs Tabling
2016-06-11 11:47:20 -04:00
Fox-McCloud
4fa4b253ef Nerfs Tabling 2016-06-08 02:14:06 -04:00
TheDZD
f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
Tastyfish
9eba1f2bef Makes glass tables drop 2 glass 2016-05-28 15:56:20 -04:00
Fox McCloud
3b30dae4a0 Merge pull request #4455 from razekpraxis/Paradise_LockClick
Adds a click sound when you lock a locker
2016-05-19 19:15:27 -04:00
Razek
8efc712b71 fixed 2016-05-18 09:07:59 +01:00
Razek
9144289780 Adds a click sound when you lock a locker. (I was so bored.)
Signed-off-by: Razek <megamattman2234@hotmail.co.uk>
2016-05-17 18:02:39 +01:00
Tastyfish
ef3859203b Makes is_mechanical() use OOP, removes bizarre is_active() 2016-05-17 07:25:52 -04:00
KasparoVy
9015f11f41 Fixes Morph Being Borked + Additional Features for Morph and C.M.A.
Before it wouldn't update skin colour or eye colour, and ended up breaking the sprite such that C.M.A wouldn't have an effect on it after.

Now it works perfectly fine, C.M.A works just fine too before and after

STAGE 2: Refactors Morph

So you change gender first and thus can actually access male beard styles, then you choose hair style and hair colour, then beard style and beard colour, then skin tone or body colour at the very end.

STAGE 3
Adds Head Accessory, Head Accessory colour, marking style and body accessory to Morph and C.M.A.
2016-05-03 01:50:16 -04:00
Fox-McCloud
c587019b87 Ports Door Wands 2016-04-25 06:06:20 -04:00
Fox McCloud
ff27b4f77a Merge pull request #4263 from Tastyfish/smooth-shuttles
Fixes shuttle smoothing
2016-04-21 22:58:49 -04:00
Tastyfish
198656874d Fixes shuttle smoothing 2016-04-21 21:35:53 -04:00
TheDZD
3dd4f16008 Merge pull request #4233 from Fox-McCloud/abduction
Abduction
2016-04-20 11:01:55 -04:00
Fox-McCloud
2954aa88ea abductor tech 2016-04-18 19:17:46 -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