Commit Graph

1042 Commits

Author SHA1 Message Date
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
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -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
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
Tastyfish
d56bf196a8 in for loops 2016-04-16 01:52:03 -04:00
Tastyfish
178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
Fox McCloud
dab1303d46 Merge pull request #4150 from Tastyfish/away-reorder
Updates maploader code to be in line with tg's, startup improvements
2016-04-11 19:41:22 -04:00
Fox McCloud
f4df310f1d Merge pull request #4166 from Tastyfish/mulehouse
Fixes MULEs not coming out of their shell.
2016-04-11 19:29:04 -04:00
Tastyfish
68b936f0e1 Fixes girder animal smash messages 2016-04-11 13:51:31 -04:00
Tastyfish
5f87411850 Fixes MULEs not coming out of their shell. 2016-04-11 04:17:32 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Tastyfish
632595ce38 Tweaks 2016-04-09 16:00:59 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Aurorablade
b58006db4e vrooom 2016-04-07 00:48:27 -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
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
2016-03-31 13:33:46 -04:00
Fox McCloud
0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts
Fethas Carnival of Horrors:Rusty Iron Chef
2016-03-30 16:25:27 -04:00
Tastyfish
08da2260a0 Ports tg's smooth progress bars 2016-03-28 04:24:26 -04:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Aurorablade
40a1086f14 butchering is still broke.... 2016-03-24 00:07:41 -04:00
Aurorablade
db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -04:00