cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-14 01:44:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,866 Commits 14 Branches 2 Tags
8349e75248ab80098a93e1a3aa28cba74485cb39
Commit Graph

1210 Commits

Author SHA1 Message Date
Qwertytoforty 09c125ff4d Adds the handheld syndicate teleporter (#14934) 
* Start of this coding adventure

* Makes it work BETTER

* MORE BETTER. LESS GIBBING IN SPACE

* BOH interactions

* PR ready-ish

* Better checks, doesnt work in mechs

* Re-adds the windowpainter

* Boxes it, mashes it, sticks it in a microwave

* Revert "fixes merge conflicts pls?"

This reverts commit 1dc5e390be, reversing
changes made to 3ec24935bd.

* Revert "Revert "fixes merge conflicts pls?""

This reverts commit 53106e10f5.

* RE ADDS EVERYTHING

* Thanks henk for helping

* Affecteds code review suggestions

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Deletes it before re-adding it

* Now adds it in

* Affecteds other request

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Changes size, type casting, class, \n

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-12-16 15:03:23 -05:00
moxian 1683c4271a Refactors renaming things with a pen. (#14960) 
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
 2020-12-16 14:43:15 -05:00
dearmochi 5edee29a50 [READY] Syndicate Contractors (#14605) 
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
 2020-12-09 12:03:23 -05:00
AffectedArc07 44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
danni boi ca97f9a92d Windowpainter (#14888) 
* adds a window painting tool

* Update code/game/objects/items/devices/window_painter.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* gigit

* edited code to match steelslayer's suggestion

* Update code/game/objects/items/devices/window_painter.dm

OOF thank you for catching that

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-11-23 19:07:54 +00:00
AffectedArc07 54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07 984ac231e0 Nano Is Dead 2020-11-21 09:46:50 +00:00
moxian 16d2638c0a Cardiac problems have a dedicated icon on medhud, not a generic "disease" (#14900) 
* Cardiac problems have a dedicated icon on medhud, not a generic "disease"

* Rename "huddefib2" -> "hudflatline"
 2020-11-18 18:08:01 +00:00
AffectedArc07 4da9abeb50 Future proofs tcomms code (#14805) 2020-11-01 09:26:02 -05:00
Qwertytoforty 997f527f3a Adds the emp bomb, and a beacon to summon it. (#14737) 
* Adds the emp bomb

* Allows traitors to buy it, corrects mistake in syndicate uplink

Also prevents explosions from setting it off

* Update code/game/machinery/syndicatebomb.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/game/objects/items/devices/radio/beacon.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* steels suggestion

* Dave's request

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2020-10-28 11:43:12 -04:00
AffectedArc07 ca29f5340e Runechat - stop bugging me for gods sake (#14141) 
* Runechat - stop bugging me for gods sake

* Hotfix

* V2

* Patch 1

* Removes Radio

* Colour Sanity

* Fixes loc issues

* 2020-08-28

* LF --> CRLF

* Forgot this

* Fixes holopad stuffs

* Preference toggle existing!

* Drask + Kidan
 2020-10-26 10:10:09 -04:00
warior4356 25da16d6d4 Merge branch 'master' into corporate-comms 2020-10-21 19:14:17 -07:00
Kyep f5a1a359a1 ERT Commander Rework (#14640) 
* ERT Commander Rework

* instant = TRUE

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-10-21 09:44:37 -04:00
moxian ed9c3a22e1 Make floor painter UI nicer and move it to TGUI (#14635) 
* Make Dropdown component use `selected` prop instead of state.

This makes the selection properly update when it's changed server-side.

* Make floor painter preview available directions nicely.

Also migrate it to tgui while at it.

* Have a preview of all available styles with pictures.

Also address the review comments.
 2020-10-21 00:12:38 -04:00
warior4356 74da3a3992 Merge branch 'master' into corporate-comms 2020-10-12 16:31:15 -07:00
AffectedArc07 561db683ad Merge pull request #13869 from Fox-McCloud/intercom-refactor 
Refactors Intercomms For Less Processing
 2020-10-04 18:37:24 +01:00
warior4356 b157355763 Merge branch 'master' into corporate-comms 2020-10-02 17:04:04 -07:00
joep van der velden 83fb00a12b Flavor text 2020-10-02 21:45:27 +02:00
joep van der velden 51577e8695 Fixes camera bugs 2020-10-02 21:38:37 +02:00
warior4356 8004bc9349 Adds procedure radio to radios and intercoms for the correct jobs 2020-10-01 13:09:53 -07:00
warior4356 493941a022 Merge branch 'master' into corporate-comms 2020-09-30 15:40:56 -07:00
warior4356 f2875ead1b Renames to procedure. Moves to X. Fixes color 2020-09-30 14:51:56 -07:00
AffectedArc07 f9dd2de5f1 [READY] [TGUI] Uplinks, PDAs and Power Consoles (Dont question it) (#14403) 
* Uplinks

* Main menu + Status display control

* Signaler + Homescreen Fixes

* TGUI Power Monitors

* PDA Power Monitor

* PDA Medical Records

* PDA Security Records

* PDA Secbot Control (Pain)

* PDA Mule Control (I hate this system)

* PDA Supply Records

* PDA Janitor Locator

* PDA Notekeeper

* PDA Manifest

* PDA Atmos Scanner

* Steel pass 1

* PDA Messenger

* Removes browserPDA-era icons

* PDA Nanomob (Why do we still support this thing)

* Fixes random power monitor quirk

* More steel tweaks

* Even more steel tweaks

* TM Tweaks Round 1

* \ref --> UID()

* Styling
 2020-09-30 16:53:45 -04:00
warior4356 ae818b140d Captain get's oversight by default 2020-09-30 13:16:14 -07:00
warior4356 dbd9ea7be5 Adds Oversight radio to Magistrate, AI, Captain, NT Rep, and IAA 2020-09-29 23:21:27 -07:00
AffectedArc07 97245c48a6 The beginning of the end (#14435) 2020-09-25 19:55:13 -04:00
SteelSlayer 01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196) 
* proximity monitor

* Update code/__HELPERS/unsorted.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-20 13:31:16 -04:00
Kugamo fbf1935def Reworks floor/airlock/pipe painters' sprites and sounds. (#14379) 
* Adds new sprites, and sounds to painters.

* Adds check, and inhand sprites

* minor fixes on sprotes
 2020-09-19 20:15:54 -04:00
AffectedArc07 a896bc825f [TGUI] Camera Consoles (Actual Magic) (#13750) 
* TGUI Camera Consoles

* inb4 I fail my own CI routines

* Makes it so AIs cant use cam consoles

* Refactors camera bugs
 2020-09-19 09:55:33 -04:00
Kyep 2e37b10cbf fixes cyborg radios 2020-09-18 03:03:37 -07:00
Kyep 423355db48 AA requests 2020-09-18 01:25:12 -07:00
Kyep a62268429c Fixes radios ignoring internal_channels 2020-09-17 19:00:47 -07:00
Shadow Quill f79e531118 Change II 2020-09-16 15:52:52 -05:00
Shadow-Quill 71e7306706 Change 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-16 15:01:12 -05:00
Shadow Quill 82b0a4b2f5 Request 2020-09-16 14:34:33 -05:00
Shadow Quill bd1d83f27d Auto stash before revert of "Merge pull request #14289 from Dovixx/SSD-portal" 2020-09-16 14:17:04 -05:00
joep van der velden 0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
Kyep 995a7c66e5 Fixes AI being unable to change radio settings 2020-09-15 11:13:10 -07:00
AffectedArc07 c39e00d7fc Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14059 2020-09-15 17:16:57 +01:00
Kyep 28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00
mochi e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
SteelSlayer 6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
Kugamo b6ad29a1ec fixes oversight, that made some scanned objects appear solid 2020-09-08 11:42:21 -05:00
variableundefined c8c1800b57 Merge pull request #13943 from AffectedArc07/more-tcomms-tweaks 
*more* Tcomms Tweaks
 2020-08-31 16:05:05 -04:00
Kugamo da45849334 splits up if statement into multiple lines 2020-08-30 15:43:23 -05:00
Kugamo c340e71999 ok this is the best solution 
A single if statement, how elegant
 2020-08-29 19:07:55 -05:00
Kugamo 702fbbfdb3 this is acutally is a better fix 
my first commit didnt account for the possibility that the revealed item could be destroyed, this way also eliminates another if statement. BUT it still goes through the full cycle for the objects(they still appear translucent for a time)
 2020-08-29 19:03:27 -05:00
Kugamo 811dd2c454 fix 2020-08-29 18:31:21 -05:00
SteelSlayer 1b9ef55246 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-25 16:36:13 -05:00
AffectedArc07 69cd58c1df Merge pull request #13934 from SabreML/Maint-Drone-Stuff 
Maintenance Drone Tweaks
 2020-08-17 13:35:59 +01:00