Commit Graph

970 Commits

Author SHA1 Message Date
variableundefined
16a064d1e6 Merge pull request #10422 from Kyep/depot_update_4
Depot Update
2018-12-13 23:06:29 +08:00
variableundefined
9e5deff65e Merge pull request #10409 from AzuleUtama/uplinkSearch
Uplink - Collapsible Categories and Layout Tweaks
2018-12-11 20:45:45 +08:00
Kyep
80da2626c7 tweak: changes trapped pizza box auto-arm from 1s to 3s timer 2018-12-06 19:25:31 -08:00
AzuleUtama
00c34f1935 Blocks job specific gear category for nukies, removed last of 'return' function uplink code, minor layout changes to template 2018-12-07 00:09:11 +00:00
AzuleUtama
d9215f3789 Made temp category start as null, cleaned up template code 2018-12-06 10:19:23 +00:00
Shadow-Quill
0a70c3549c Changed 'protocals' to 'protocols'
SPELLING WHEE
2018-12-05 10:59:52 -06:00
AzuleUtama
a578f9cef7 Uplink Category Search
Makes it so users can pick categories in the uplink
2018-12-05 16:02:51 +00:00
variableundefined
63490c8378 Merge pull request #10330 from tigercat2000/multilingual
Multilingualism
2018-11-28 10:48:19 +08:00
variableundefined
24ace06513 Merge pull request #10324 from granodd/ReagentScannerUpgrade
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
2018-11-25 08:38:29 +08: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
Granodd
4b1ee1eeb6 Removing the mass spectrometer and replacing it with the reagent scanner. 2018-11-23 19:48:18 -05:00
AzuleUtama
ad03363936 stopped random potentially picking a discount after its been bought
Fixed a very unlikely to occur bug, also got rid of old code that served no purpose.
2018-11-23 21:37:28 +00:00
AzuleUtama
3bf5c482ce Small changes and merged with master following some recent additions to uplink items
Keeping it updated alongside master.
2018-11-23 12:03:59 +00:00
AzuleUtama
c8fbdd4b42 Merge remote-tracking branch 'upstream/master' into discounts 2018-11-23 11:33:08 +00:00
AzuleUtama
609d429233 Got things working properly... ish 2018-11-21 00:00:17 +00:00
alex-gh
7b2ad525e4 Fixes runtime in syndieteam radio. 2018-11-20 04:49:03 +01:00
AzuleUtama
2d6bb70729 Discounts!
LET'S GO SHOPPING!
2018-11-19 19:01:46 +00:00
alex-gh
45435169f5 Fixes anonymous syndicate borg radio. 2018-11-17 08:11:43 +01:00
Certhic
e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
craftxbox
ec83e5c1f0 Update radio.dm 2018-11-12 12:19:36 -03:30
craftxbox
99de04db94 use human mob's voice instead of name. 2018-11-12 12:11:38 -03:30
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
warior4356
8012e0ac43 Tweaks made. 2018-11-07 16:04:18 -08:00
variableundefined
a741ff4961 Merge pull request #9949 from AffectedArc07/ghost-spawns
Adds Space Ruins / Ghost Roles
2018-11-02 08:12:01 +08:00
warior4356
0ee51bdcc2 Reverts maps. Fixes conflict. 2018-10-31 19:13:22 -07:00
warior4356
b6d5bccd54 Fixes code bugs 2018-10-31 17:32:35 -07:00
warior4356
8a0767a88a Adds speach impediment handling to megaphones 2018-10-29 14:33:35 -07:00
warior4356
13d927c10e Drills implimented 2018-10-29 01:10:10 -07:00
variableundefined
e5680badc4 Merge pull request #9902 from alex-gh/anonymous_syndieradio
[READY] Syndicate communication channel is now pseudonymous.
2018-10-26 18:59:56 +08:00
alex-gh
1ef1933948 Replaced 0/1 with TRUE/FALSE where obvious. 2018-10-26 11:51:59 +02:00
warior4356
f068ea2a2a saving work 2018-10-24 12:29:36 -07:00
alex-gh
c36a997703 Added duplicate name checking. 2018-10-24 14:42:19 +02: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
Certhic
e8597c897d removed unused pretend weapon code 2018-10-21 21:04:01 +02:00
Certhic
b5e8e5e88f fix: autopsy scanner unresponsiveness 2018-10-21 20:41:32 +02:00
Purpose
2ebf971806 resolved icon conflicts 2018-10-21 11:46:39 +01:00
Purpose
88afb698d1 Fixes flashlight not calling parent proc correctly 2018-10-21 11:28:59 +01:00
alex-gh
20f0520398 Fixed nuke ops being anonymized. 2018-10-21 09:50:33 +02:00
variableundefined
e2f7b7e388 Deconflict once again 2018-10-21 10:18:15 +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
alex-gh
d31d2d71a0 src removal 2018-10-19 15:32:50 +02:00
alex-gh
6a4d878940 Makes syndicate comm channel pseudonymous. 2018-10-19 14:34:47 +02:00
variableundefined
152a350538 Deconflict 2018-10-19 16:07:04 +08:00
Mark Mak
91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
datlo
ac5cc480b9 Adds the Honk Brand Infiltration Kit
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
variableundefined
569f68b128 Merge branch 'master' into RelPath 2018-10-12 14:08:19 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00