cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 08:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,019 Commits 26 Branches 2 Tags
e869c81a9e051757bf6c0fe7bafdcdcd79d4672e
Commit Graph

22946 Commits

Author SHA1 Message Date
AffectedArc07
e869c81a9e Ah yes the joys of CI testing 2021-02-02 21:40:27 +00:00
AffectedArc07
fed578c3fd RustG version + log format unit tests 2021-02-02 21:35:56 +00:00
SteelSlayer
69da27fe10 Fixes an issue when saving preferences while using an IPC character (#15421) 
* sql fix

* wrong var
 2021-02-02 19:57:54 +00:00
github-actions[bot]
d27f9e584f Automatic TGS DMAPI Update (#15412) 
* Update TGS DMAPI

* Cleanup attributes

Co-authored-by: DMAPI Update <action@github.com>
 2021-02-02 12:46:09 +00:00
Kyep
b7fe4241e3 [TGUI] TEG (#15367) 
* TGUI TEG

* rm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-02-02 10:04:39 +00:00
dearmochi
1d89138436 [TGUI] GPS (#15335) 
* [TGUI] GPS

* Address AA

* Why are you here

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-01-31 16:04:51 +00:00
SabreML
c7bea0eb8e [TGUI] Drone Control Console (#15222) 
* Drone UI V1

* Bigger button

And admin log clarification

* Review 1

Also commented out the drone 'rebooting' action, since it didn't work.

* Spacing

Seemed a bit too cluttered.

* Review 2

Co-Authored-By: dearmochi <shenesis@gmail.com>

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-01-30 23:54:09 +00:00
Fox McCloud
82f1d2ce59 Improves Geiger Counters; Allows Toggle (#15366) 
* Improves Geiger Counters; Allows Toggle

* no arg

* spelling

* tweaks
 2021-01-30 23:22:21 +00:00
SabreML
7fd5970600 Immovable Rod Z-level fix (#15391) 
* Rod fix

* Meteors and helpers
 2021-01-30 22:11:18 +00:00
sneksnek
fdb8b94c3c Adds mint, a new plant that can be processed into menthol (#15383) 
* Update medicine.dm

* Update herbals.dm

* Update vending.dm

* added mint seeds

* added mint harvest

* added mint plant

* an attempt to fix the problem

the pr is having trouble with growing.dmi for some reason, i was told to do this

* another empty line for the above reason

* wow okay, be like that then

* no empty lines since you're bickering

* lets see if you like this

* forgot the mint chem in reagents/misc.dm

daily reminder that im a smooth brain

* made it green and distill into menthol

* made it goon

* moving it to the appropriate file

* moved to food.dm since it's a consumable

* clarification of new distilling result for desc
 2021-01-30 16:53:51 -05:00
AffectedArc07
62b618dcd4 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2021-01-28 21:35:44 +00:00
Fox McCloud
8a461a4e53 Refactors Heaters and Coolers (#15376) 
* Refactors Heaters and Coolers

* Update tgui.bundle.js

* flail

* tweaks

* Update tgui.bundle.js

* Update tgui.bundle.js
 2021-01-28 21:18:24 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371) 
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
 2021-01-28 20:57:37 +00:00
Fox McCloud
d2e22fb942 Merge pull request #15374 from AffectedArc07/initialized-blobs 
Makes blob stuff /Initialize()
 2021-01-28 15:48:30 -05:00
dearmochi
e5e9f107b0 Uses crisp font in antagonist HUD maptext (#15375) 
* Uses crispy font in blob HUD maptext

* Other antags
 2021-01-28 20:44:46 +00:00
AffectedArc07
a602f39352 Merge remote-tracking branch 'ParadiseSS13/master' into initialized-blobs 2021-01-28 19:07:31 +00:00
Kyep
36674f05f1 [TGUI] Minor Fixes/Tweaks To Various Machines (#15365) 
* comms computer fixes/refactor

* card computer tweaks

* IDcomputer: colorize departments in list

* faxmachine: aghosts no longer see log out when not logged in

* Fixes #14591

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-01-28 19:06:18 +00:00
Fox McCloud
1fc2fcf3a7 Better Supermatter Monitor (#15364) 
* Better Supermatter Monitor

* even better

* tweak

* Update tgui.bundle.js

* Update tgui.bundle.js
 2021-01-28 18:45:11 +00:00
SabreML
cf94ee8d34 [TGUI] Gravity Generator (#15174) 
* Gravity TGUI V1

* This too

* Dialog

* Autodoc global

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Review stuff V1

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-01-28 16:32:51 +00:00
AffectedArc07
0eb73ed657 Merge remote-tracking branch 'ParadiseSS13/master' into initialized-blobs 2021-01-28 15:56:44 +00:00
AffectedArc07
c39d8ada02 Makes blob stuff /Initialize() 2021-01-28 15:49:07 +00:00
AffectedArc07
d638732228 (Almost) All /turf now Initialize() 2021-01-28 11:28:06 +00:00
Fox McCloud
8122fa0a67 Merge pull request #15347 from AffectedArc07/map-standardisation-v3 
[READY] The big kahuna - Map Standardisation
 2021-01-27 13:39:44 -05:00
SabreML
81138b8b66 Adds a warning message if the game config files aren't set up properly (#15238) 
* Config file warning V1

* Better version

* More stuff

* Log and ingame message

* File names

Also removed all ' from the `log_world()` since they ended up encrypted in the actual log.
 2021-01-27 17:39:21 +00:00
AffectedArc07
0d5cf58798 Merge remote-tracking branch 'ParadiseSS13/master' into map-standardisation-v3 2021-01-27 08:48:06 +00:00
github-actions[bot]
dd53e8c41e Automatic TGS DMAPI Update (#15356) 
* Update TGS DMAPI

* Cleanup attributes

Co-authored-by: DMAPI Update <action@github.com>
 2021-01-26 09:54:37 +00:00
AffectedArc07
28ca87ef31 Delta Standardisation 2021-01-25 13:06:08 +00:00
AffectedArc07
7245f86b2d The big kahuna - Map Standardisation 2021-01-24 23:57:55 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331) 
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
 2021-01-24 22:03:13 +00:00
Farie82
acaefa9591 Refactors the events to be async (not use sleeps) and not use spawns (#15203) 
* Makes the prison break use INVOKE_ASYNC for the (win)doors

* Add documentation

* Refactors the whole event system to not use spawns and be async

* relative proc path

* keep timing

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
 2021-01-24 21:57:13 +00:00
SabreML
a8b7888ae9 Cable Retracting (#15285) 2021-01-24 13:39:08 +00:00
SabreML
039f82d17e 'Who' verb chat spam improvement (#15307) 
* Who separation

* Revert "Who separation"

This reverts commit 1ba50cbf3d.

* Status Panel

Due to popular demand... version 2!
 2021-01-24 13:37:44 +00:00
FreeStylaLT
573520fc1e Changes HoS outfit and adds an assistant outfit for Plasmamen (#15316) 2021-01-24 13:36:54 +00:00
datlo
9e4061a796 Update grey translator implant to have a proper EMP effect (#15323) 
* Add a proper emp_act to translator implant

Getting EMP'd as a grey with a translator now causes 20 brain damage and shuts down the translator for a minute.

* Remove brain damage
 2021-01-24 13:34:49 +00:00
Qwertytoforty
f1ef0f99a3 Gives some tells to using holy water on vampire thralls. (#15329) 
* Gives some tells to using holy water on vampire thralls

* henk's honking suggestion

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-01-24 13:33:43 +00:00
Fox McCloud
bcc496edcd Supermatter Update (#15291) 
* Supermatter Update

* tweaks and updates

* mapping it in

* tweaks and fixes

* one last thing

* final touches

* what? NO
 2021-01-23 20:47:54 +00:00
github-actions[bot]
6933507820 Automatic TGS DMAPI Update (#15332) 
* Update TGS DMAPI

* Cleanup attributes

Co-authored-by: DMAPI Update <action@github.com>
 2021-01-23 18:19:02 +00:00
SabreML
2c2bd88cd7 Fixes the PDA Messenger not decoding HTML tags (#15236) 
* Messenger Fix V1

Co-Authored-By: moxian <moxian@users.noreply.github.com>

* Messenger Fix V1.1

Now with 100% less javascript!

Co-authored-by: moxian <moxian@users.noreply.github.com>
 2021-01-21 21:03:25 +00:00
dearmochi
0783f87ce2 Fix equipping welding helmet hiding mask slot (#15327) 2021-01-21 21:01:18 +00:00
AffectedArc07
df66fc0f44 Notification for admins if a user closes a PM window that was force opened (#15311) 
* Force notifications

* Remove excess arg
 2021-01-20 11:28:56 -05:00
Ryal
09d47409a2 Allows Janitor borg's EMAG lube to refill in a charger (#15278) 
* Allows Janitor borg's EMAG lube to refill in a charger

* Update code/modules/mob/living/silicon/robot/robot_modules.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-01-20 10:10:08 +00:00
Farie82
4224400ae7 Improves existing projectile logging. Deflect/Reflect etc (#15281) 
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
 2021-01-20 10:08:37 +00:00
dearmochi
14e9e92508 Sets ERT's offstation_role to TRUE (#15282) 2021-01-20 09:59:54 +00:00
Farie82
d8714d98bc Makes the plasmacutter and spellblade not delete cut of limbs (#15288) 
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
 2021-01-20 09:55:24 +00:00
SabreML
5aeede675b Fixes one handed dswords (#15289) 
* One handed deswords

* Reverts unintended changes

Got a bit confused, I need more coffee
 2021-01-20 09:54:26 +00:00
Qwertytoforty
c946d5ee2b Less instant death of captain (#15301) 2021-01-20 09:53:44 +00:00
Farie82
f945e60545 Fixes an exploit with the foam dart and pen combo (#15322) 
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
 2021-01-20 09:35:52 +00:00
SabreML
00002a7f3a Fixes visible message when showing paper (#15270) 
* Fix

* Other stuff

* Review and lipstick fix

* !do_after()

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Unstaleining

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-01-18 22:16:47 +00:00
SabreML
0ea3df1195 Update carbon.dm (#15227) 2021-01-18 21:45:32 +00:00
SabreML
ea18ee9507 SSD warning spam (#15306) 2021-01-17 09:09:36 +00:00