Commit Graph

875 Commits

Author SHA1 Message Date
TheDZD
629caa47f8 Merge pull request #5165 from Fox-McCloud/alt-click-madness
Alt Click Madness
2016-07-26 14:08:21 -04:00
Fox-McCloud
0870c66303 tweak 2016-07-26 14:02:07 -04:00
Fox-McCloud
8a2e78c323 Removes Cablecuffs... 2016-07-22 22:58:50 -04:00
Fox-McCloud
d83fe43331 tweak 2016-07-22 19:25:07 -04:00
Fox-McCloud
451044863e Alt Click Madness 2016-07-22 16:09:16 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the
map loader to safely load templates mid-run
2016-07-07 23:52:44 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Crazylemon64
a44808f195 Final map tweaks 2016-07-03 17:17:56 -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
monster860
3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
monster860
64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Tastyfish
6d99fdedf3 Fixes splitting cable coils off inactive hand not having correct color 2016-06-02 17:08:47 -04:00
TheDZD
4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
Fox McCloud
bd1e928e8f Merge pull request #4509 from Tastyfish/nanomation
Nifty animated UI's
2016-05-28 17:35:30 -04:00
Tastyfish
4fd9d3e131 Nano animations! 2016-05-27 14:52:04 -04:00
Tastyfish
41e508e154 Adds suicide_act for light tubes/bulbs 2016-05-27 00:36:10 -04:00
Crazylemon64
b44b40d387 You can now fasten the TEG circulators, to make your own TEG 2016-05-21 14:33:05 -07:00
Fox McCloud
1441c472b5 Merge pull request #4371 from tigercat2000/better_blueprints
Ports holomap blueprints from tg/vg.
2016-05-07 22:54:52 -04:00
Tigercat2000
bee2954d7b Ports holomap blueprints from tg/vg.
Changes:
 - Clicking "view structural data" in the station blueprints menu will
   show you ghost images of where things like disposal pipes, wires,
   atmospherics pipes, and other power machinery are originally supposed
   to go. Note, this will show you the ghost images over turfs even if the
   machinery is destroyed.
2016-05-05 22:05:39 -07:00
Tigercat2000
954796fec2 Makes the "lightbulbs don't burn you" thing less awful
you can now remove lightbulbs regardless of intent if you are able to
remove them, if you're on disarm or grab you'll burn yourself if you
aren't able to, if you're on help or harm you'll get a message of "too hot
to touch!"
2016-05-05 15:36:11 -07:00
TheDZD
5435084dc7 Merge pull request #4328 from Fox-McCloud/tesla-update
Tesla Update/Rebalance
2016-05-01 12:52:40 -04:00
Fox-McCloud
8322aa9338 Tesla Update/Rebalance 2016-04-30 06:44:01 -04:00
Fox-McCloud
2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
Tastyfish
3b59d2cd15 Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster 2016-04-29 23:42:47 -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
Mieszko Jędrzejczak
ef13110610 Permanently dooms everyone and basically kills the universe. 2016-04-27 15:07:30 +02:00
Mieszko Jędrzejczak
6c21db1433 Adds different interactions on different intents 2016-04-27 12:10:48 +02:00
TheDZD
ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions
Xenobio Addition
2016-04-26 20:23:49 -04:00
Fox-McCloud
552b02050a Merge remote-tracking branch 'upstream/master' into fixes-cold-heat 2016-04-20 18:06:03 -04: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
Mieszko Jędrzejczak
5e5a735845 Lightbulbs don't burn anymore. 2016-04-19 20:37:49 +02: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
afddc2d8f1 Fixes+Cleans Up Cold+Heat Resist Mutations 2016-04-15 00:38:44 -04:00
Fox-McCloud
81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07: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
1fc692ba94 Adds power-generating treadmills to brig cells. 2016-03-30 17:08:04 -04:00
Fox-McCloud
08c06782ee Can Make Cable Coils in Autolathes 2016-03-15 22:40:49 -04:00
Tastyfish
5e5083ba23 Fixes some things for away missions, and a few missions themselves 2016-03-11 00:42:22 -05:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Crazylemon
b6e737c151 Supermatter explosion now only affects mobs on the same z-level 2016-01-25 17:03:09 -08:00