Commit Graph

2094 Commits

Author SHA1 Message Date
Fox-McCloud
d1c54753c2 Fixes Safety Scissors Meta 2016-05-05 07:39:28 -04:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings
Crazy Fethas Traitor Emporium of Horrors
2016-05-04 01:22:13 -04:00
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
Fox-McCloud
2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
TheDZD
66c5b2cd9a Merge pull request #4321 from Fox-McCloud/cig-fix
Cig Icon FIx
2016-04-29 19:48:26 -04:00
TheDZD
411dbdcf40 Merge pull request #4246 from FlattestGuitar/lightbulbs
Lightbulbs no longer burn you, lighters do a bit less.
2016-04-29 19:44:01 -04:00
Fox-McCloud
e3513cd4e6 Cig Icon FIx 2016-04-29 06:37:57 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Fox McCloud
110958860b Merge pull request #4270 from FlattestGuitar/foamforce
Ports /tg/ FOAM FORCE
2016-04-27 11:43:55 -04:00
TheDZD
ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions
Xenobio Addition
2016-04-26 20:23:49 -04: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
cdc20258a1 Merge pull request #4212 from Tastyfish/bans
Cleans up special role jobbans
2016-04-25 18:34:37 -04:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +02:00
Fox McCloud
ff2da1c159 Merge pull request #4238 from Aurorablade/Kungfu
Fethas Carnival of Horrors:crouching tarajan,hidden unathi
2016-04-25 04:35:35 -04:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Aurorablade
ec263dbfca mimejutsu 2016-04-22 16:07:56 -04:00
Fox-McCloud
ab16128e7c Updates Mining Loot Crates 2016-04-21 21:37:13 -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
Mieszko Jędrzejczak
a24b14ed35 Fixesssss 2016-04-20 23:16:46 +02: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
TheDZD
3dd4f16008 Merge pull request #4233 from Fox-McCloud/abduction
Abduction
2016-04-20 11:01:55 -04:00
Fox-McCloud
87a9f30bd4 Part 6 2016-04-18 05:32:41 -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
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
TheDZD
03f1afec4d Merge pull request #4201 from Fox-McCloud/dna-injector-refactor
DNA Injector Partial Refactor and DNA Machine Exploit Fix
2016-04-15 22:08:36 -04:00
Tastyfish
127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -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
Fox-McCloud
7e4ef50da9 DNA Injector Partial Refactor 2016-04-14 07:49:18 -04:00
Fox-McCloud
81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -04:00
Fox McCloud
f923c3d4ff Merge pull request #4153 from pinatacolada/sop-books
Adds SOP books
2016-04-12 03:29:03 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs
Ports SNPCs
2016-04-11 20:44:50 -04:00
pinatacolada
b30b826e21 forgot legal and standard sop oops 2016-04-11 16:10:05 +01:00
pinatacolada
b75bc658db typo 2016-04-10 21:44:31 +01:00
pinatacolada
06d7c325ea thought i had this fixed 2016-04-10 21:21:27 +01:00
pinatacolada
b5768f485c Adds SOP books
Adds SOP books to the corresponding departments and department head's
offices. Rep and IAA have a brand spanking new shelf with all the SOP
books.

Also right now it's using generic book sprites because I couldn't sprite
even if my life depended on it, maybe someone could sprite something
nice for them?

Also fixed a random < that was just kinda there out in nowhere in an
atmos book
2016-04-10 21:16:29 +01:00
FalseIncarnate
6654767cd2 Burnt match bugfix
Fixes burnt matches being able to light cigs and such.
2016-04-10 00:10:58 -04:00
FalseIncarnate
990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
FalseIncarnate
d21168fb38 Vendor and Pipe Changes
Using a screwdriver on a vendor circuitboard now provides a nice list of machines to select from, rather than relying
on RNG to select them.

Vendor circuitboards have been moved from the Circuit imprinter to the Autolathe, and have had their costs tweaked accordingly
- Was 1000 glass and 20 sacid, now 750 glass and 250 metal
- This was because cargo is meant to be responsible for vending machines, and you had to get the supply containers from cargo ANYWAYS just to build a new one

Pipes, cigarettes, and joints can no longer be lit with a burnt match

Pipes and corncob pipes no longer can be refilled infinitely at whim
- A new item "pipe tobacco tin" has been added to the cigarette vendors, which can be used on an empty pipe to refill it 5 times before being consumed.
- Tobacco, Space Tobacco, Ambrosia Vulgaris, and Ambrosia Deus can be put directly into an empty pipe to fill it with that as an alternative

Pipes (the ones from the merch store computer) have had their volume reduced to 100, from 200 (that's still a lot of nicotine)

Corncob Pipes no longer come pre-filled, as that made no sense (normal pipes still come pre-filled, because you paid good money for that)
- They have also had their smoketime reduced to 400, from 800, so they don't last longer than purchased pipes
2016-04-08 02:51:04 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -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
Fox-McCloud
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Fox McCloud
752d106bef Merge pull request #4067 from tigercat2000/510staging
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00