Commit Graph

840 Commits

Author SHA1 Message Date
TheDZD
bcfa4d1863 Merge pull request #5171 from Fox-McCloud/apply-damage
Fixes up apply_damage
2016-07-26 13:28:43 -04:00
Fox-McCloud
25c01ef3ba Fixes up apply_damage 2016-07-22 21:03:17 -04:00
Fox-McCloud
fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
Crazylemon64
15b5662f59 And your little research server too! 2016-07-20 21:31:57 -07:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04: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
TheDZD
5c29bf3a64 Merge pull request #5074 from Fox-McCloud/adminbus-reagent
Tweaks Adminordrazine, Cleans up Reagents, Fixes body temperature adjustments, and makes a few tweaks
2016-07-18 14:41:45 -04:00
Fox-McCloud
f0b8d3b097 more cleanup 2016-07-17 00:44:58 -04:00
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -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
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts
Did someone say "loadouts"?
2016-07-15 11:25:34 -04:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
FalseIncarnate
2b77c45694 Merge conflict fix 2016-07-08 00:46:46 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
FalseIncarnate
adbc85a56b Buildable Deep Fryers
Deep fryers can now be built and upgraded with some minor assistance
from science.
- Board requires programming 2, just like the microwave and such
- 2 micro lasers + 5 cables
- Upgrading the lasers decreases the cook time

🆑
rscadd: Deepfryers are no longer arcane mysteries, and can be
(de)constructed and upgraded.
/🆑
2016-07-07 18:47:56 -04:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
KasparoVy
55b138ff57 kill more conflicts. 2016-07-05 21:48:27 -04:00
Ar3nn
a153d1c7ea Rubble from the nukes from orbit 2016-07-04 16:06:29 -04:00
KasparoVy
8f660f230c killconflicts 2016-07-03 20:23:00 -04:00
KasparoVy
d476516f88 Vox-compatibility for Most Suits, Fixes Reactive Armour Icon Update Bug
Also adds hiding tails by-species. Updates captain space-suit helmet hair-hiding code.
Fixes a bug where Reactive Armour's sprite wouldn't update when you turned it on or off.
Adds species-fitting for clothing accessories.
Adds the ability to open and close the Clown Officer and Soldier coats.

Adds Vox sprites for the following suits and accessories:
Unathi robe, unathi mantle, all ERT armour (not the spacesuits), armour vest, reflective armour vest,
Security armour vest, bulletproof armour vest, Detective armour vest, blueshield armour vest, combat armour vest,
laser tag vests, ian shirt, suspenders, waistcoat, vest, first responder jacket, bomber jacket, security bomber jacket,
black suit jacket, blue suit jacket, purple suit jacket, IAA jacket, NT Rep jacket, forensics jackets, overalls,
captain's carapace, Blueshield coat, trenchcoats, pirate and old pirate coats, HoS coat, HoS trenchcoat, Warden's jackets,
leather jacket, all military jackets, all ponchos, hazard vest, brigphys vest, reactive armour, riot/swat armour,
heavy armour, thunderdome armour, all knight armour, all bombsuits, regular and atmos firesuits, all biosuits, webbing,
clown officer coat, clown soldier coat.
2016-07-03 19:39:15 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
taukausanake
795271048d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud 2016-06-20 11:23:28 -05:00
taukausanake
55326e1c70 Technical difficulties
Decided to scrap the beekeeping HUD for now. Turned out it's way more complicated that I thought. I'll try it again in the future.
Added the Hydro HUD design for Protolathe. Need to test if it works.
Might have made a mistake in Git so commiting in order to pull from Paradise master to see if anything broke.
2016-06-20 11:20:32 -05:00
TheDZD
3e45999b32 Merge pull request #4624 from monster860/nanoui
Makes RnD console use NanoUI
2016-06-19 13:37:07 -04:00
TheDZD
76ff7b48a3 Merge pull request #4633 from monster860/rnd-speed
Makes stock parts build 5x faster
2016-06-16 11:31:19 -04:00
monster860
14c340001a Desnowflakizing 2016-06-16 11:01:25 -04:00
Kyep
50afa5b6a6 Clarified sentience potion message (#4646) 2016-06-13 23:11:17 -04:00
monster860
c814156ca8 Makes stock parts build 5x faster 2016-06-10 16:22:26 -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
18a49a4817 Adds a bit of width to the console 2016-06-08 21:22:24 -04:00
monster860
a31c87e2e0 Makes RnD console use NanoUI 2016-06-08 21:14:14 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss
Experimentor Duplication Limit
2016-06-08 11:15:18 -04:00
Fox McCloud
3594337638 Merge pull request #4558 from monster860/cluwne_voice
Adds comical implants
2016-06-07 09:31:02 -04:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00
Fox-McCloud
56b4eb72bf Fixes Experimentor Cold Critical Reaction 2016-06-05 22:24:24 -04:00
monster860
073aad1211 lein nutes 2016-06-01 18:11:52 -04:00
monster860
9d3a6fc979 Comical implants 2016-06-01 16:43:36 -04:00
TheDZD
4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD
20ad49f9f9 Merge pull request #4383 from IK3I/Pod-Refactor
[Ready for Review] Pod refactor and fixes
2016-05-31 20:48:05 -04:00
monster860
d171cedada Makes upgrading the experimentor acutally make it better. 2016-05-28 21:10:13 -04:00
monster860
afa8bc7321 fix experimentor clone mode 2016-05-28 09:19:14 -04:00
monster860
50ecd8c319 Fix criticalReaction 2016-05-28 09:19:07 -04:00
monster860
d1b5cfb99f Fixes grabbing Ian and Runtime when using roundstart experimentor 2016-05-28 09:18:56 -04:00
IK3I
0dce120cf6 Implements Code Suggestions 2016-05-26 02:39:32 -05:00
IK3I
ec9bc0ac2f Merge remote-tracking branch 'upstream/master' into Pod-Refactor 2016-05-23 14:59:23 -05:00