Commit Graph

12118 Commits

Author SHA1 Message Date
TheDZD
f69ff5f30a Merge pull request #4264 from Fox-McCloud/mining-crate
Updates Mining Loot Crates
2016-04-22 23:57:32 -04:00
TheDZD
7990a25cf0 Merge pull request #4255 from Fox-McCloud/how-revolutionary
Updates Revolution
2016-04-22 23:57:03 -04:00
Aurorablade
ac31143cb9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 23:29:06 -04:00
Fox McCloud
e6666a8c4c Merge pull request #4266 from monster860/fixgriff
Fix ERT teleport exploit with abductor
2016-04-22 23:10:32 -04: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
Tigercat2000
66416ae5ec Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE
Conflicts:
	code/game/gamemodes/vampire/hud.dm
2016-04-21 20:31:58 -07:00
Tigercat2000
0f70e6810b -tg- OOP Hud Refactor
- Added 4 new HUD styles
 - Humans recreate their hud if they change their UI pref mid-game
 - Refactored how objects are added to the client screen
 - HUD's are now handled by subtype and mob/proc/create_mob_hud()
 - HUD visibility is no longer chained directly to the F12 button, it's a proc on HUD datums now
 - Mobs only create/destroy their HUD when necessary, not every Login()
 - Destroyed aim-mode, it didn't work and I couldn't make it work.
 - Renamed all of the screen1_x.dmi files to screen_x.dmi
 - Removed screen1.dmi, screen_gen.dmi now handles generic icons.
2016-04-21 20:28:08 -07:00
Fox McCloud
ff27b4f77a Merge pull request #4263 from Tastyfish/smooth-shuttles
Fixes shuttle smoothing
2016-04-21 22:58:49 -04:00
monster860
55af378cfe Fix griff 2016-04-21 22:22:02 -04:00
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
Fox McCloud
7594206d16 Merge pull request #4261 from Tastyfish/vampfix
Fixes devamping via the traitor panel
2016-04-21 20:15:19 -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
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
Tastyfish
b798e7ef18 Fixes devamping in traitor panel 2016-04-21 19:58:49 -04:00
KasparoVy
6398e9c3fe Pass2 2016-04-21 19:58:38 -04:00
pinatacolada
35b2d8589c what falseincarnate said 2016-04-21 21:48:28 +01:00
pinatacolada
b35b3cf870 Makes fridge boards be selectable
Screwdrive the board to select what type of fridge board you want.

🆑 pinatacolada
tweak: Makes fridge boards be selectable by screwdriving them
/🆑
2016-04-21 18:02:54 +01:00
Fox-McCloud
3dd9a6d744 Updates Revolution 2016-04-21 06:36:35 -04:00
Meisaka Yukara
e4b2f8d870 Fix the light toggles on drones and guardians. 2016-04-21 11:23:08 +09:00
Fox-McCloud
5af5705413 Abductor Handcuff Fix 2016-04-20 19:38:55 -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
9779746d7a last tweaks 2016-04-20 00:12:11 -04:00
TheDZD
5df0a9afe4 Merge pull request #4221 from tigercat2000/tgalerts
-tg- screen alerts
2016-04-19 19:13:31 -04:00
Matt
8f4fd998a9 Fixes and prizes 2016-04-19 22:05:43 +02:00
Fox-McCloud
e96f37ba3a further tweaks 2016-04-19 01:56:37 -04: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
87a9f30bd4 Part 6 2016-04-18 05:32:41 -04:00
Fox-McCloud
78bedb60f3 Part 5 2016-04-18 04:47:23 -04:00
Fox-McCloud
5145825470 Part 4 2016-04-17 22:48:05 -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
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
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
Matt
0b0ce96ddb Adds SpessChess! 2016-04-16 19:44:55 +02:00
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
Fox McCloud
3e7222610f Merge pull request #4216 from Tastyfish/420blazeit
Makes the game startup time significantly faster
2016-04-16 02:03:29 -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
Fox McCloud
c4b16c21ee Merge pull request #4141 from monster860/fixpoddoors
Spesspod door code refactor
2016-04-15 22:09:18 -04: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
Fox McCloud
925bb2d9e2 Merge pull request #4203 from FlattestGuitar/shotglass
Adds shot glasses
2016-04-15 20:17:23 -04:00