cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,958 Commits 26 Branches 2 Tags
b3cc376f1cd63da8564a3bf995fae83cae6b344c
Commit Graph

34 Commits

Author SHA1 Message Date
warriorstar-orion
12cf1ed3ad More varied and balanced maintenance loot. (#26500) 
* More varied and balanced maintenance loot.

* linting

* assign updatepaths script PR number

* went a bit overboard with the trash

* get rid of varedited lootdrop spawners on maps

* Separate trash and food trash for mappers

* fix incorrect food/other trash statistics

* TM feedback tweaking round 1

Significantly lower occurrence of all tier 2 items.

* allow randomizing angles, use for litter

* move trait delta to define, bump loot chance 10%
 2024-08-26 21:35:14 +00:00
warriorstar-orion
01f6fb8725 refactor: remove maint loot spawn varedits. (#26451) 
* refactor: remove maint loot spawn varedits.

* Update script with PR number
 2024-08-11 21:10:09 +00:00
Aylong
c34eb2522d Remove icon_stated broken wood floors (#26395) 
* Remove icon_stated broken wood floors

* Yeah, this is it
 2024-08-06 23:17:55 +00:00
warriorstar-orion
2026d7c294 give reqconsole directional updatepaths script its proper ID (#26386) 2024-08-04 22:52:49 +00:00
warriorstar-orion
3f75f3b8c3 refactor: Requests console directional helpers. (#26226) 2024-08-03 17:40:18 +00:00
DGamerL
098b13bb33 Removes the empty type of /snacks (#26010) 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-29 14:46:04 +00:00
warriorstar-orion
102f6ffa5b refactor: remove 'blood track' varedits and splatter color (#26237) 
* refactor: remove 'blood track' varedits and splatter color

* script number

* Update code/game/objects/effects/decals/Cleanable/humans.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-20 16:29:17 +00:00
warriorstar-orion
f861670748 refactor: move 'old sink' varedits to type' (#26236) 
* refactor: move 'old sink' varedits to type'

* script number
 2024-07-15 22:00:00 +00:00
warriorstar-orion
c844c3ae06 mapping: create directional helpers for fire alarms. (#25897) 
* mapping: create directional helpers for fire alarms.

* set PR number
 2024-06-28 03:33:49 +00:00
warriorstar-orion
34ed5b59aa mapping: create directional helpers for wallmeds (#25809) 
* mapping: create directional helpers for wallmeds

* got our PR number
 2024-06-12 18:51:03 +00:00
Marm
5a68c5f6d3 Explorer Redux (#24202) 
* WE'RE SO BACK

* LET THERE BE SOUND

* More bugs

* fixes

* sound

* hmm

* clothing sprites + minor code changes to clothes

* meestake

* spritening

* YARR

* hiss

* Cyberiad explorer remap

* hand telover

* delta days

* rooms done

* VENDOR

* Mapping done

* Salvage mapped

* qol

* Forgot the hivelord.

* woops

* oops redux

* reviews and more

* consistency

* Update code/game/jobs/job_globals.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* character

* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/effects/spawners/random_spawners.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/pirate.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/effects/spawners/random_spawners.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/research/designs/machine_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* some reviews

* Update code/game/machinery/constructable_frame.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* supply

* area repathing and ambience

* mapping

* metamapping

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* the doorening

* redooring

* modsuit

* more reviews

* the plasmamamninigngg

* add random salvage generation across space ruins

* add blackbox tracking for salvage sold

* gun

* deconflicts and reviews

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/garment.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* all conversations resolved

* maybe work now?

* please no more, too many apcs

* Update code/modules/mob/living/simple_animal/corpse.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* henri review + action figure

* Update code/game/objects/items/toys.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* PDA

* conflicts

* more conflicts

* maybe all conflcits?

* wait fuck

* maybe fixed???

* KIDAN SPRITES

* MAYBE?

* access fixes

* explorer hotfixes 1:

- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room

* add salvage selling back

* NOT FOR SALE

* oh my god actually sell the fucking salvage this time

* maybe fine now?

* carpover

* NO MORE CABLE

* balance tweaks

* some depot loot updates

* merge conflict

* deconflicted???

* woops more oversights

* skirts, bombers, exploredrobe code + sprites

* woops (again)

* deconflicting

* remove old explorer room again

* Hat fix

* minor changes to sprites and code for hats

* yarrr fix 1

* first fixes

* don't drop loot from syndies gibbed by depot destruction

* add selling back with new signal based system

* speedmerge this shit

* minor changes to collars/bomber resprite

* docking port in

* ruins

* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN

* no more murder hallway on whiteship

* undelete meson sunglasses, redelete uristrunes

* BOOTY BAGS

* don't drop ashdrake loot from crusher kills

* box: fix ntrep fax, add explorer access to ORMroom

* add meson sunglasses item icon back

* fix cere handtele, meta shutter control, death sound arg

* cleaning up

* she mosins on my russian till i dj station

* Update code/modules/clothing/head/soft_caps.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* mapping

* Cleaning up

* revert changes in tools/{bootstrap,ci}

---------

Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-05-27 19:27:59 +00:00
warriorstar-orion
b15ed89463 Create directional helpers for air alarms. (#24652) 
* Create directional helpers for air alarms.

* rename script, need alarm_area always

* I love automated changes
 2024-04-12 18:24:12 +00:00
warriorstar-orion
cb691a0bb5 constructible transit tubes day 1 patch (#24739) 
* tubes day 1 patch

* i know the PR number now
 2024-04-07 10:20:42 +00:00
warriorstar-orion
08f9a8129b use directional helpers for ATMs (#24426) 
* use directional helpers for ATMs

* updatepaths script PR number

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-16 16:25:30 +00:00
Venuska1117
ef8dd6651b Replace var edited "icon_state" for disposal pipes with existing subtypes (using UpdatePaths) (#24249) 
* Queue Rock is comming

* Add updatepath for pipes.

* Fixing conflicts.
 2024-03-16 12:00:05 +00:00
warriorstar-orion
df5c7f1f9a Add directional variants to APC sprites (#24155) 
* Add directional variants to APC sprites.

Provide exhaustive UpdatePaths script for every single APC around.
Run script across all map files.

* add separate directions

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-24 18:35:10 +00:00
warriorstar-orion
3377f181cb add condiments to reagent updatepaths script (#23963) 2024-02-06 18:26:48 +00:00
DGamerL
0141042abc Fuck (#23880) 2024-01-23 10:52:15 -06:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
Aylong
4e76e777d9 Randomless Kirby plants (#23376) 
* Kirby randomless

* Whoops

* Whoops x2

* Maps Script & missing plant

* Spellcheck

* Plant eye fix

* Update code/game/objects/structures/flora.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* double pipe fix

* errant sign removal

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-14 13:22:18 +00:00
Contrabang
0849386a3a Maplint now prohibits var-edited grilles (#23331) 
* i love CI!

* WILL... IT... FIX?

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-14 12:55:26 +00:00
Aylong
37879c530b Boxes new sprites & little refactor (#23213) 
* Sprites and little refactor

* idk what i am doing

Maybe refactor

* Sort the boxes

* Matches path

* Script and maps

* Okay... that was a strange decision.

* bathroom parts box

* More boxes

* Henri review changes

* Update toy.dmi

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update storage.dmi

* Update boxes.dmi

* True conflict solve

I hope

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-01-06 23:31:36 +00:00
Contrabang
09dd7309ad Lava is no longer a plating + all lava is smooth (#23482) 
* woohoo

* sirryan review

* accept incoming and stuff

* fuck
 2023-12-16 11:47:44 +00:00
DGamerL
307120e7d3 Patches and pills are now no longer subtypes of food (#23063) 
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2023-11-21 15:37:16 +00:00
S34N
49b0071400 Repaths some decals, makes copyTurf copy decals (#22528) 
* why do I do this to myself

* pass 2

* maps

* delete this

* PR number obtained

* Revert "maps"

This reverts commit 87926f4a0c.

* maps
 2023-10-30 20:15:14 +01:00
Venuska1117
b234b3e4ba Sort "mob_spawn.dm" to 2 specific categories. (#21728) 
* NanoMap Auto-Update (Sun Jul  2 02:02:08 UTC 2023)

* Sorting mob_spawn file to have 2 categories.

* Holy jesus
So many files using alive and corpses... send help.

* Delete wizardcrash.dmm

* Trying..

* fixing mime/clown .dmm stuff

* Test

* Fix UpdatePaths file
now it should contain all corpses/alive path swapping.

---------

Co-authored-by: NanoMap Generation <action@github.com>
 2023-09-08 21:23:30 +01:00
Contrabang
65ab4a5d89 Refactors station areas to be /area/station subtypes (#21681) 
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
 2023-09-06 17:37:50 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619) 
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-09-01 22:06:59 +01:00
warriorstar-orion
fc7176b3b6 tools: Provide UpdatePaths script for all basic airlock cases for on-station access (#21565) 
* initial commit, no PR# yet

* PR number

* Add windoor access helpers script.
 2023-08-21 19:31:06 +01:00
Venuska1117
ede086a241 ... (#21560) 2023-07-23 22:25:55 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769) 
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
 2023-07-21 15:56:00 +01:00
S34N
ce7d68fcf1 Fixes draggable bushes, sprite oversight [MAPPING CHANGES] (#19351) 
* no drag the bush, and other tweaks

* im smart

* mapping changes

* delete
 2022-10-19 16:22:41 -05:00
S34N
8ef5c698d6 New newscaster sprites [MAPPING CHANGES] (#19252) 
* map

* PR number

* master maps

* re-apply changes

* manually stop that shuffle
 2022-10-15 11:30:56 -05:00
S34N
4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034) 
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

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

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-06-21 23:53:19 +01:00