Commit Graph

670 Commits

Author SHA1 Message Date
variableundefined
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist
Ports Move Force from TG
2018-12-28 20:53:07 +08:00
variableundefined
678d4fa20e Merge pull request #10469 from datlo/grenadierbelt
Ports the grenadier belt from tg
2018-12-24 09:16:02 +08:00
variableundefined
e892535b27 Merge pull request #10364 from Allfd/nofunallowed
Remove fart based mechanics
2018-12-24 09:13:47 +08:00
variableundefined
046f40958a Merge pull request #10446 from Ty-Omaha/superheroes
Re-adds superheroes
2018-12-18 16:37:00 +08:00
datlo
3f2804c8bf adds the grenadier belt and permafrost'd tiles 2018-12-17 11:53:28 +00:00
Citinited
5529102530 Adds the snow machine 2018-12-13 08:30:39 +00:00
Ty-Omaha
bb316e231c superheroes 2018-12-12 00:22:32 -05:00
variableundefined
9e59827416 Merge pull request #10351 from Citinited/duct-tape-stick-tweak
You can stick duct tape to more than just paper now
2018-12-11 20:18:05 +08:00
variableundefined
63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
Alffd
e2e5f71ec7 Remove fartbased everything 2018-11-26 21:48:45 -05:00
Citinited
05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
variableundefined
328a2d3dcb Merge pull request #10283 from Ty-Omaha/reflector-blob
Adds/ports modified reflective blobs
2018-11-24 08:28:37 +08:00
Ty-Omaha
2ce52aa2fe ricochet and stuff 2018-11-21 10:50:45 -05:00
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
Ty-Omaha
57b2458db0 reflector 2018-11-19 12:08:42 -05: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
Mitchell
7cd25c4d87 for ansari to view 2018-11-11 15:59:48 -06: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