Commit Graph

654 Commits

Author SHA1 Message Date
Fox McCloud
fca03ff254 Merge pull request #10032 from variableundefined/SqueakComponent
Add in squeak component & refactor bikehorn, mouse to use it.
2018-11-20 18:38:42 -05:00
Certhic
6850d3d27a multitool fixes 2018-11-20 14:21:25 +01:00
tigercat2000
9e51b56cbd NTSL2 fixes (ParadiseSS13/Paradise#10232) 2018-11-15 11:03:16 -08:00
variableundefined
5c72537d8c Fixes merge conflicts 2018-11-14 09:21:21 +08:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
2018-11-08 20:24:22 -08:00
variableundefined
7544ae573f Add in squeak component and refactor mouse, bikehorn, clown suit to use it. 2018-11-04 14:17:45 +08:00
variableundefined
ca43b7f29a Merge pull request #10031 from Certhic/nymphs-gui
diona nymphs fixes and hud
2018-11-03 18:20:47 +08:00
Fox McCloud
ecb9c11433 Updates Components Again 2018-11-02 16:23:46 -04:00
variableundefined
a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns
Adds Space Ruins / Ghost Roles
2018-11-02 08:12:01 +08:00
Certhic
80a341d6a7 nympphs fixes and gui 2018-10-28 15:10:43 +01:00
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
variableundefined
bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls
(TGCRP) - /tg/ catgirl refugee program
2018-10-27 11:00:34 +08:00
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
tigercat2000
b0c1033d51 Fix humans layering over other objects incorrectly 2018-10-25 16:07:00 -07:00
tigercat2000
bd744965b0 But legitimately /tg/ icons 2018-10-25 12:58:06 -07:00
tigercat2000
8dc88cb80b Closer to working 100% 2018-10-25 01:48:51 -07:00
tigercat2000
64ea56f025 Merge remote-tracking branch 'upstream/master' into SPIN_ME_RIGHT_ROUND
# Conflicts:
#	paradise.dme
2018-10-24 23:43:25 -07:00
AffectedArc07
dbfeba6d59 Merge branch 'space-ruin-number-one' of https://github.com/SamHPurp/Paradise into ghost-spawns 2018-10-22 20:39:31 +01:00
variableundefined
e42adaa276 Fix 2018-10-21 21:59:43 +08:00
Purpose
2ebf971806 resolved icon conflicts 2018-10-21 11:46:39 +01:00
tigercat2000
4d17f14de0 Radial Menu Port & RCD Refactor-Upgrade
This commit ports tgstation/tgstation#39991 and parts of
tgstation/tgstation#40350.

Primary changes:
 - A radial menu system has been introduced, which can contain any
 arbitrary sprite and be applied to any arbitrary object.
 - RCDs take advantage of this radial menu system; Using them in-hand
 will no longer directly bring up the UI, but instead, will bring up a
 radial menu that can directly change between modes (as well as access
 the old UI)
2018-10-20 22:59:39 -07:00
variableundefined
3bd73279e7 No more bitshift 2018-10-21 09:10:50 +08:00
variableundefined
d4376fff69 Fixes conflict and screen object breaking 2018-10-21 08:31:46 +08:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
Purpose
8a6bbd6aad Adds glowsticks 2018-10-20 09:34:45 +01:00
Fox McCloud
7d3be0e838 Updates the Garbage SS 2018-10-20 00:49:55 -04:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
Fox McCloud
ee8d6bade6 Fixes Timer SS Timeouts 2018-10-16 23:40:57 -04:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
tigercat2000
98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
tigercat2000
8ce0592ac0 SSOverlays & Hover Inventory Indicator
This ports the hover inventory indicator from /tg/, and by necessity, SSOverlays.
The hover inventory indicator basically shows where you are trying to
put an item, and then shows an item ghost in red or green, giving visual
feedback as to if that item will go in the slot or not.

SSOverlays is a much broader system for managing overlays, which should
eventually take over *all* overlays, but I have only ported the basic
system and implemented it where necessary for it to work for the hover
inventory items currently.
2018-10-08 22:50:39 -07:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
variableundefined
27a99f8ed7 Merge pull request #9581 from DesolateG/timertest
Ports updated /tg/ timer subsystems.
2018-10-09 09:11:55 +08:00
variableundefined
3667426fd5 Merge pull request #9772 from SamHPurp/mouse-opacity-define
Creates mouse_opacity defines
2018-10-09 08:25:55 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Citinited
13cb2a4850 Adds some more description and adds a specific layer for conveyors 2018-10-08 20:38:49 +01:00
Crazylemon64
5b0eedcee5 Refactors buildmode into submodules, and adds an "atmos" buildmode
Also makes the mode selection interface far less tedious/painful

Adds unsimulated turf overriding, and admin logging

Temporary commit for storing the sdql buildmode

Adds extra documentation

also requires a path to be selected for "advanced" and "fill" modes, now

Spaces out mode switch buttons nicer

removes need for debug rights to do a fill with mob paths

Adds a bunch of extra fancy paths

Fox Changes pt 1

Backports /tg/station changes

Fixes a double-tap issue with dclick handling of certain mobs

Also no longer shows the "selection canceled" if you haven't selected a
region for the buildmode that supports region selection

Updates buildmode stuff
2018-10-07 20:54:40 -07:00
Crazylemon64
3db4229918 First big chunk of the refactor
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
variableundefined
f923a2a48b Merge pull request #9419 from Birdtalon/ticketrefactor
Tickets 2: The ticketting - Converts tickets to subsystem + extra
2018-10-01 16:20:46 +08:00
Crazy Lemon
e3e22ca2ab Merge pull request #9476 from variableundefined/SSNanoMob
Port Nano Mob to StonedMC
2018-10-01 01:13:58 -07:00
variableundefined
38c7496755 Merge pull request #8867 from DarkPyrolord/tenbloodyyears
Fixing an old atmos error
2018-09-28 12:04:58 +08:00
Desolate
56d762bafb Ports updated /tg/ timer subsystems. 2018-09-27 06:56:41 -05:00
Crazy Lemon
4991d152af Merge pull request #8811 from FalseIncarnate/kitchen
Mixing Bowls and Kitchen refactors
2018-09-26 17:32:39 -07:00
Crazy Lemon
c37170b868 Merge pull request #9259 from Kyep/make_meth_less_op
Reduces speed bonus from Meth
2018-09-04 09:46:55 -07:00
variableundefined
17a5454fbc Port over three PRs from TG about component. 2018-09-04 23:19:30 +08:00
variableundefined
841463c17e Port Nano Mob to StonedMC 2018-09-02 20:27:52 +08:00