Commit Graph

4 Commits

Author SHA1 Message Date
DreamySkrell
ae3bf5f331 SCC Scout Ship (#17826)
* scout ship stuff

* stuff

* work

* xyz

* all roles

* things

* mappin

* things

* Revert "things"

This reverts commit ca4006f1c8.

* thingz

* ay

* xyz

* spawner

* a

* H

* holy hell

* huh

* m

* 6

* a

* o

* 9

* 8

* o

* o

* xd

* 5

* 2

* 999

* areas

* 7

* a

* 134

* 12

* o

* random.dmi

* 87

* a

* s

* u

* 5

* 7

* 6547

* ,

* 2534

* ghostspawner

* 2

* 5

* 6

---------

Co-authored-by: DreamySkrell <>
2023-12-18 12:27:09 +00:00
Wowzewow (Wezzy)
462115b501 The Pumped Up Kicks Update (#16265)
* The Pumped Up Kicks Update

Shoes. New shoes. Look at them.

* WELCOME TO THE UNDERGROUND

* for the love of crust

* turns out a var already existed for that but was never implemented ffs

* face it you're never going to make it

* these are winter boots

* removes Paradox's Thinly Veiled Fetish

* shiit

* Apply suggestions from code review

* Update code/modules/clothing/shoes/oxfords.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* oops

* fuck this file

* nice balls, bro

* check out how hard i can pee

* pissing on the moon

* caligaeae

* pee pee poo poo man

* fixes

* damn you

* merge fixes

* knees more

* damn you merge conflict

* fix

* fixes 2

* riding boots

* truly, this fixes things

* dammit ctrl s

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-13 11:29:03 +00:00
DreamySkrell
d0c758cdf1 Replace /pottedplant/random with /random/pottedplant/ (#16944)
* madness

* changelog

* haha changelog fail

* post merge fix

* huh

* post merge fix

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

---------

Co-authored-by: DreamySkrell <>
2023-08-03 22:51:25 +00:00
DreamySkrell
b29b431e64 Split random.dm into categorized files (#16826)
* split random.dm into categorized files

* c

* Update code/game/objects/random/clothing.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/clothing.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/loot.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/loot.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/loot.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/game/objects/random/misc.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* fix conflict

* pizza

* post conflict fix

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-07-30 19:10:20 +00:00