cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 14:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,955 Commits 27 Branches 2 Tags
c2f494cdaa4ee73df7e64a75b031eae3224c6261
Commit Graph

3209 Commits

Author SHA1 Message Date
mochi
c2f494cdaa [TGUI] Newscasters 2020-10-03 23:55:58 +02:00
AffectedArc07
b6acce8f89 Merge pull request #14500 from farie82/martial-arts-fix2 
Fixes some issue with being cloned while having martial arts
 2020-10-02 10:47:56 +01:00
joep van der velden
84813f3fc5 Remove temp mart arts. And reteach non temp on mind transfer 2020-10-01 19:58:32 +02:00
AffectedArc07
e107b1cf1e Merge pull request #14443 from SabreML/Miner-preferences-clothing 
Changes the Character Preferences representation for Shaft Miners to use the new sprites
 2020-10-01 17:28:42 +01: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
SabreML
39d066792f Mining clothing 2020-09-26 14:20:51 +01:00
AffectedArc07
97245c48a6 The beginning of the end (#14435) 2020-09-25 19:55:13 -04:00
mochi
dc50cecef3 Address AA 2 2020-09-24 11:32:17 +02:00
mochi
535d4fb33b [TGUI] Security Records 2020-09-23 22:28:07 +02: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
AffectedArc07
f110cef216 [TGUI] Cargo Console (#14386) 
* TGUI Cargo Console

* Addesses Mochi
 2020-09-20 11:47:14 -04:00
SabreML
b73fc0c29b Adds a 'Clear Scanner Records' action for Forensic Scanners (#14274) 
* Adds clear_scanner as a verb

* Changed 'spawn()' to 'addtimer()'.

Also made the 'ding' sound a bit quieter.

* Some 'attack_self()' refactoring

* Some 'print_scanner_report()' refactoring

* Some 'scan()' refactoring

* Changes 1 & 0 to TRUE & FALSE

* and the rest of them

* Review fixes

Moved 'lowertext()', removed implied src,
changed '\the [target_name]' to '[A]'.

* Changed 'clear_scanner' from a verb to an action

* Made 'print_forensic_report' its own action

Don't want reagent scanners getting the same icon

* More cleanup
 2020-09-19 23:04:07 -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
AffectedArc07
ce2f0d401d Swings the axe on modular consoles (#14355) 
* Swings the axe on modular consoles

* Experience will not save you in these parts
 2020-09-19 09:36:56 -04:00
dearmochi
101ad5b617 Ports security webbing from /tg/ (#14354) 
* Ports security webbing from /tg/

* Can only be purchased from cargo (15 pts for 3)
 2020-09-18 18:53:42 -04:00
mochi
b02c41ba63 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 20:27:23 +02:00
farie82
229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341) 
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
 2020-09-18 11:07:19 -04:00
Qwertytoforty
f6b8fe5547 Makes CNS rebooter stun on EMP (#14234) 
* Makes CNS rebooter stun on EMP

* Kyets requests

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
 2020-09-18 10:44:38 -04:00
farie82
8e8ad65906 Makes most targeted spells select a target on click with a radius (#13220) 
* Basis

* Make most targeted spells use a click with radius instead of a list

* Fixes

* Selection code

* return ..()

* Auto targeting

* Forgot a comment change

* Merge issue fix
 2020-09-18 10:30:32 -04:00
mochi
976642ddcd Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 11:09:26 +02:00
mochi
d55716824c Add brackets, use proper command globals 2020-09-18 11:05:50 +02:00
mochi
fbc728f01a Better bolding 2020-09-17 23:19:34 +02:00
mochi
d2780648cf Fix atmos control not refreshing data correctly 2020-09-17 23:03:08 +02:00
mochi
5e74a76362 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-17 22:20:49 +02:00
mochi
888ac72650 Refactor NanoMaps, TGUI Crew Monitor 2020-09-17 22:18:57 +02:00
Kugamo
55249e2862 Adding wearability to fried vox trash (#13978) 
* code to add head wearing functionality to fried vox trash
 2020-09-16 18:58:00 -04:00
farie82
915e0913a9 Make spell buttons light up slowly when recharging (#13200) 
* Make spell buttons light up slowly when recharging

* Recharge percentage

* whoops
 2020-09-16 15:41:02 -04:00
AzuleUtama
8cf7051cb9 Energized fire axe rework (#13907) 
* Energized axe reworked and now subtype of regular axe
 2020-09-16 15:36:39 -04:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
variableundefined
d9a8da98bb Merge pull request #14028 from SteelSlayer/spawn-removal 
Some spawn removals and other assorted code cleanup
 2020-09-16 11:47:59 -04:00
AffectedArc07
cafe92f93b Fixes duct tape exploit (#13985) 
* Fixes duct tape exploit
 2020-09-16 11:34:18 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
denghis1
845e7a8b75 Added the warning cone as a headpiece for Ian (#14216) 
* Added the warning cone as a headpiece for Ian
 2020-09-16 09:52:40 -04: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
variableundefined
1d5358f79b Merge pull request #14215 from AffectedArc07/removes-omni-atmos 
Removes omni gas devices
 2020-09-15 22:27:42 -04:00
AffectedArc07
9470e34aed Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14101 2020-09-15 20:01:16 +01:00
variableundefined
701972fc67 Merge pull request #13914 from Kyep/winter_dome_remove_cap_laser 
Updates to lavaland winter biodome
 2020-09-15 14:52:18 -04:00
Kyep
ec8b67b2c3 fixes merge conflict 2020-09-14 18:59:14 -07:00
variableundefined
3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag 
Adds Bulldog extended drum mags and bundle for nuke ops.
 2020-09-14 16:45:04 -04:00
mochi
f1b7e9f7cc please just end my life 2020-09-14 20:15:09 +02:00
mochi
e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
mochi
fa9eb84c8b Address AA 2020-09-14 19:58:18 +02:00
SteelSlayer
2a70626c78 affected review tweaks 2020-09-14 11:38:17 -05:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07
a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul 
Overhauls and Refactors Alarm System
 2020-09-14 13:54:06 +01:00
AffectedArc07
ac0a9b7ba7 Merge pull request #14145 from TDSSS/armory-shuttle 
New admin shuttle template: Armory shuttle
 2020-09-06 11:13:01 +01:00
AffectedArc07
47aeac7954 Merge pull request #14149 from Nazsgull/extraSpessRuins 
Adds extra spess ruins
 2020-09-06 11:07:09 +01:00
Certhic
d0c2feff2b uplink runtime fix 2020-09-04 10:05:31 +02:00
AffectedArc07
91b40eab92 Removes omni gas devices 2020-09-02 11:49:45 +01:00
awdaw
7d6eb503ba Update space.dm 
Fixes an oopsie I did with an extra L at allow_duplicates
 2020-08-31 16:29:12 +02:00