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
53,784 Commits 26 Branches 2 Tags
c13535c2d00dcdcec2f9d2ce99da8ebe55efeb96
Commit Graph

835 Commits

Author SHA1 Message Date
Kugamo
7189ae5d65 Janitor QOL (#17594) 
* Yes

* No

suggested changes

* Maybe

Suggestions + water in cart sprites

* Merge Conflict Resolve

* Suggested Changes :o)

* fixes bugs

* suggested changes round 2
 2022-04-22 11:39:21 +01:00
S34N
1e34507c34 fixes gun cabinets breaking with less than 3 guns (#17639) 2022-04-22 11:35:36 +01:00
Vi3trice
b0f0ae91bc Add random critter crate, remove the unused crate subtype and tweak the animal hospital lavaland ruin to use new random crate (#17536) 
* Let's stick with the closet

* Update crittercrate.dm
 2022-04-12 16:06:34 +01:00
Vi3trice
ae76172934 Clean up crate code, and fix emagging making the manifest invisible and not making sparks (#17500) 
* That's some janky stuff

* That wasn't supposed to be saved

* Updated to the new crate sheet. Still essentially just removing redundant sparks.

* I thought I did that already
 2022-04-07 18:14:44 +01:00
Christasmurf
7f9cd8541b add icons and code (#17497) 
Co-authored-by: Christasmurf <2543783+Christasmurf@users.noreply.github.com>
 2022-03-21 17:09:30 +00:00
Dragonkiller93
6eeb6a1504 Borg locker verb fix. (#17408) 2022-03-09 14:13:22 +01:00
Adrienn József
37cba8b915 Adds seclite to the HoS' and the blueshield's lockers (#17403) 
Co-authored-by: Adrienn József <93430361+Adrienn-Jozsef@users.noreply.github.com>
 2022-02-17 09:50:17 +01:00
Sirryan2002
3feb5493e8 Reverses "Yes" & "No" options for BS Compression Packaging Prompt on Crates (#17377) 2022-01-27 20:32:07 +01:00
AffectedArc07
2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
Fox McCloud
27a4e47e91 Fixes Security Closets Not Having Seclites (#17120) 2021-11-16 23:13:02 +01:00
Fox McCloud
55a6c23bc7 Removes civilian: Return of the Assistant King (#17103) 
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
 2021-11-16 19:49:08 +01:00
variableundefined
a5c65002b5 Merge pull request #17100 from Adrer/Cabinet-doors-2-electric-boogaloo 
Fix cabinet doors 2: Electric boogaloo
 2021-11-14 15:37:04 -06:00
variableundefined
2c5c495cd1 Merge pull request #17064 from Vi3trice/heres-johnny 
Rework the fireaxe cabinet so it uses less sprites, and other tweaks
 2021-11-14 15:32:41 -06:00
adrermail@gmail.com
531bb709b6 Fix cabient doors 2 2021-11-14 14:09:31 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
Vi3trice
1a99534125 Oh fireaxe closet why you so bloated 2021-11-08 19:37:53 -05:00
Cocacolagua
2d8f2f75bc Wall-locker fixes (#17051) 
* fixes wall lockers

* removes invisible locker
 2021-11-07 09:02:56 +01:00
S34N
44c12c6d9d Fixes open crate sprites (#17050) 
* fakin underscores

* more crates

* sneak this one in too
 2021-11-06 21:42:47 +01:00
variableundefined
1739f411a2 Merge pull request #16823 from S34NW/3/4th-closet 
3/4ths Sprite Project: Closets
 2021-11-06 14:19:14 -05:00
S34NW
44d8d455bf merge conflict part 2 2021-11-01 10:18:51 +00:00
S34NW
1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00
variableundefined
c0e21aa64e Merge pull request #16996 from hal9000PR/bnuuy 
Adds Bunnies.
 2021-10-31 22:24:31 -05:00
Vi3trice
758908e5ff CE closet has an RCD (#16820) 2021-10-26 23:32:38 +01:00
SabreML
945e00e497 IAA locker, spare headsets, and general locker cleanup (#16440) 
* Locker + Bookcase tweaks

* HoS flask
 2021-10-26 23:09:45 +01:00
hal9000PR
e5afa54965 Merge remote-tracking branch 'upstream/master' into bnuuy 2021-10-26 19:53:15 +01:00
hal9000PR
f095264807 bnuuy 2021-10-26 19:47:41 +01:00
Luc
2908f321be Fix fireaxe cabinet not dropping the axe when destroyed (#16880) 
* Move fireaxe item init later, make sure destroy properly forcemoves it too

* Normal locker code can clean up after itself

* Remove extra space, oops

* remove parent call

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-09 16:47:52 +01:00
S34NW
5dc80d6cba steel pass 2 2021-10-02 22:26:37 +01:00
S34NW
e78613e591 steel initial changes 2021-10-02 22:02:43 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
S34NW
c860b48c22 correct overlay adding format 2021-10-02 00:49:15 +01:00
S34NW
9820105059 final round of fixes 2021-09-28 12:18:38 +01:00
S34NW
83f8fbdfac locker door and open state trimming 2021-09-28 00:51:19 +01:00
S34NW
1c867b414c HERE COME THE CLOSETS 2021-09-27 19:33:42 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
E-MonaRhg
101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
Fox McCloud
9df0c803cc Merge pull request #16420 from SabreML/fire-nerf 
Fire-safety closet extinguisher tweak
 2021-07-27 13:11:17 -04:00
E-MonaRhg
4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefined
d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config 
[READY] Converts configs to use TOML + Configuration refactor
 2021-07-25 08:26:29 -04:00
SabreML
54797636a0 Fire-safety closet ordering 2021-07-24 23:55:33 +01:00
SteelSlayer
fbda59a8f5 slime-iv (#15642) 2021-07-16 17:34:06 +01:00
S34N
3417b51c9e Maps in the HoS hardsuit (#15637) 
* Added HoS locker to all maps

* removes sneaky magboots

* Update code/game/machinery/suit_storage_unit.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-16 16:13:46 +01:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
E-MonaRhg
c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
datlo
7de29bd81f Replace nukie jetpacks by oxygen tanks (#16101) 
* Replace nukie jetpack by oxy tanks

* replace all harnesses
 2021-06-29 11:46:43 +01:00
SabreML
c266b27aed Another small bugfix bundle (#16260) 
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-26 22:57:27 +01:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
Aziz Chynaliev
acfcce6728 Do not run hack in /obj/structure/closet if not mapload (#13) (#16201) 
Co-authored-by: Simon Ogorodnik <simon.ogorodnik@gmail.com>
 2021-06-18 16:41:05 +01:00