cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,056 Commits 26 Branches 2 Tags
c9f587010eb85acced555ef9be14fd8ccf5284ee
Commit Graph

22967 Commits

Author SHA1 Message Date
Kyep
c9f587010e fix (#15467) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-02-07 21:33:11 +00:00
Qwertytoforty
66d987691c Fixes wallrot (#15461) 2021-02-07 16:11:41 +00:00
Fox McCloud
935a092179 Merge pull request #15403 from AffectedArc07/sm-delam-stat 
Adds a stat for supermatter delaminations
 2021-02-07 06:08:14 -05:00
Fox McCloud
aa86510c54 Turf Refactor, Part 1: Purging /turf/simulated/shuttle (#15454) 
* Turf Refactor, Part 1: Purging /turf/simulated/shuttle

* everything but shuttle templates

* it is done

* titanium airlocks

* correcting multi-turfs
 2021-02-07 11:06:55 +00:00
SabreML
715ceb2c11 Adds a name for the Chef's pet Goat (#14222) 
* Added a name to the Chef's pet goat

* Changed 'unique_pet' to true, to stop renaming

Also changed 'New()' to 'Initialize()', since it's better.

* Revert "Changed 'unique_pet' to true, to stop renaming"

This reverts commit b8f722b161.

* Revert "Added a name to the Chef's pet goat"

This reverts commit 034a83b1f1.

* The Chef's goat is now named Pete

* Pete is now a subtype

* 'unique_pet' is now 'TRUE', rather than '1'

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-02-06 21:54:08 +00:00
Fox McCloud
b3b11a81c5 LINDA Performance Refactor (#15384) 
* LINDA Performance Refactor

* forget about this

* very important refactor content
 2021-02-06 21:50:11 +00:00
SabreML
298bff6b7a Channel removal (#15443) 2021-02-05 11:29:19 +00:00
Kyep
b11a97398f SM engine APCs no longer short out during APC short/overload events (#15439) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-02-05 11:28:02 +00:00
Fox McCloud
228ae8ff64 Purging Will Continue Until Simulations Improve (#15436) 2021-02-04 16:53:17 +00:00
AffectedArc07
95e4bf87c7 Fixes and improves TGS revision info (#15283) 
* Initial Commit

* Fixes this

* Try this

* Apply suggestions from code review

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
 2021-02-04 11:07:20 -05:00
AffectedArc07
e25cdc791f Initialized singulo 2021-02-03 22:09:23 +00:00
SabreML
6a8ef73719 Some Admin/Mentor help improvements (#15415) 
* Ticket thing V1

* Flipped Buttons
 2021-02-03 21:57:07 +00:00
Fox McCloud
8997cd114d Merge pull request #15433 from AffectedArc07/initialized-shuttles 
Initialized /obj/docking_port
 2021-02-03 15:53:17 -05:00
Fox McCloud
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357) 
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
 2021-02-03 20:52:03 +00:00
AffectedArc07
6b47d10f00 Mapload arg 2021-02-03 20:44:37 +00:00
AffectedArc07
d9f4895f78 Initialized /obj/docking_port 2021-02-03 19:00:26 +00:00
dearmochi
7b1ddc9c81 Makes the Contractor Kit a 20 TC uplink purchase (#15284) 
* Makes the Contractor Kit a 20 TC uplink purchase

Increases Blackout cooldown to 45 minutes
Adds logging on target extraction

* Removes clear TP topic

* Non-traitors can no longer purchase the kit

* Update locate()

* Prevents vampires and changelings from buying

* remove spess

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-02-03 15:48:00 +00:00
Fox McCloud
f15c90ad5e Removes Space Hotel (#15416) 
* Removes Space Hotel

* tweak
 2021-02-03 10:29:49 +00:00
Fox McCloud
6074323192 Further Updates Windows (#15427) 
* Further Updates Windows

* correction
 2021-02-03 10:04:52 +00:00
Kyep
38d1c93586 Prevents server-freezing spin() calls (#15428) 
* Fixes server-freezing spin() calls

* AA suggestion

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

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-02-03 09:22:53 +00:00
Fox McCloud
b003474bdc Merge pull request #15420 from AffectedArc07/initialized-spacepods 
Initialized spacepods
 2021-02-02 15:38:11 -05: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
AffectedArc07
c7f99899b3 Initialized spacepods 2021-02-02 13:08:37 +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
AffectedArc07
2c1123ddc3 Adds a stat for supermatter delaminations 2021-01-31 13:33:56 +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