Commit Graph

1616 Commits

Author SHA1 Message Date
TheDZD
72932cf5c6 Merge pull request #5091 from Fox-McCloud/shielded-hardsuit
Adds Shielded Hardsuit to Nuke Ops
2016-07-21 09:58:20 -04:00
TheDZD
d6f9a63296 Merge pull request #5112 from FreeStylaLT/justwhothehelldoyouthinkIam
Adds a chameleon secHUD to traitor uplink store
2016-07-21 09:43:57 -04:00
TheDZD
c8dae2d7b5 Merge pull request #5092 from Fox-McCloud/powerfist
Ports Powerfist
2016-07-21 09:27:07 -04:00
TheDZD
544e8e2e30 Merge pull request #5107 from Fox-McCloud/buttonssss
Fixes Performance Issue with Action buttons, removes redundant verbs
2016-07-21 09:23:54 -04:00
Fox-McCloud
473f2498a0 well then 2016-07-21 07:22:06 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud
1ac09a962c Cleans up Vars 2016-07-21 01:43:16 -04:00
FreeStylaLT
e6a187a9cd SYNDICAT REATINING 2016-07-20 14:05:05 +03:00
FreeStylaLT
a1ff35078c adds the chameleon sechud to traitor uplink 2016-07-20 13:51:49 +03:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04:00
Tigercat2000
7a07573e12 Fix latejoining mimes, spacing, Grant/Remove casting 2016-07-19 07:59:52 -07:00
Tigercat2000
56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
Fox-McCloud
3ae35fce71 Ports Powerfist 2016-07-18 07:46:42 -04:00
Fox-McCloud
b8239ac1a4 Adds Shielded Hardsuit to Nuke Ops 2016-07-18 07:03:15 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox-McCloud
e98c8978bd aesthetic lava 2016-07-16 11:54:43 -04:00
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun
Plastic Explosives Update
2016-07-16 04:07:12 -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
Fox McCloud
be8cc0432d Merge pull request #4691 from taukausanake/plant_hud
Hydroponics HUD
2016-07-15 21:47:36 -04:00
Fox-McCloud
01ffeb45fe more tweaks 2016-07-15 05:52:56 -04:00
SamCroswell
e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox McCloud
66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop
Paradise Pop
2016-07-14 23:58:24 -04:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
SamCroswell
cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
Fox McCloud
22484a4073 Merge pull request #5012 from Kyep/vampfix
Makes Vampire preference appear on Traitor panel
2016-07-13 03:02:11 -04:00
Kyep
17630cef32 Makes Vampire preference appear on Traitor panel 2016-07-12 23:48:41 -07:00
Fox-McCloud
a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
Fox-McCloud
943eb9b6dc grammar 2016-07-11 02:19:24 -04:00
Fox-McCloud
762ed61881 Adds in Rathen's Secret 2016-07-10 20:04:17 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets
The Honkening
2016-07-09 18:29:11 -04:00
TheDZD
a144980bde Minor tweaks 2016-07-09 11:37:26 -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
TheDZD
9cfb3dc644 Overeating is bad for you 2016-07-07 21:58:34 -04:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
Crazylemon64
f0bac4c179 Initialization deferral is now handled by the caller, but
is now also seamless
2016-07-07 00:17:21 -07:00
Krausus
783536d278 Replaces ID photos with bicons 2016-07-07 01:25:56 -04:00
Krausus
b37cecbeae Fixes various runtimes (squashed)
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
2016-07-05 23:30:01 -04:00
Crazylemon64
27ee3c7247 It's re-entrant now 2016-07-04 14:52:19 -07:00
Crazylemon64
2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Crazylemon64
f2b48c7c67 You can now load the cyberiad with the map-loader 2016-07-02 22:50:45 -07:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
TheDZD
21ebb83b7a Merge pull request #4835 from Fox-McCloud/sniping-nukies
Adds Sniper Rifle to Nuke Ops Uplink
2016-07-01 20:36:48 -04:00
FalseIncarnate
496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -04:00
Fox-McCloud
19f98e860c Adds Sniper Rifle to Nuke Ops Uplink 2016-06-30 20:07:13 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
TheDZD
3a262b7a67 Merge pull request #4777 from Kyep/mindshield
Renames Loyalty implants to Mindshield implants
2016-06-30 12:03:03 -04:00
TheDZD
784b299fe2 Merge pull request #4822 from Fox-McCloud/laughter-demon
Ports TG's Laughter Demon
2016-06-30 11:25:58 -04:00