Commit Graph
1024 Commits
Author SHA1 Message Date
SandPoot 51fdbc73d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-10 23:14:02 -03:00
zerothebigboy 5206524dd4 gommit 2021-09-02 07:38:48 -04:00
97e4b7aef9 Apply suggestions from code review
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
2021-07-21 19:58:58 +02:00
WanderingFox95andGitHub fabd42be43 lowercase items #2 2021-07-20 23:00:55 +02:00
WanderingFox95andGitHub 1af648dd47 Bone Spade & Glaive 2021-07-20 18:56:10 +02:00
SandPoot 3b119c132d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-02 11:22:41 -03:00
b7a1e1e0b2 Upstream merge (#169)
* changes

* changes

* changes

* changes

* changes

* changes

* removes combat mode effects

* changes

* changes

* changes

* changes

* changes

* changes

* changes

* less awful

* baton change

* whew

* okay

* math fix

* framework

* Oh Boy

* fixes

* conflict gone

* whew

* yell wip

* ripping off my own code

* fixes

* almost compiling

* e

* auto

* hacky

* local testing time

* modifications

* sigh

* Yelling works

* attempt examinate

* fix

* yelling

* ok

* it works

* it works.

* woo

* let's make this work

* Update PubbyStation.dmm

* Incinerator mapping tweak

* qm can announce to station

* blue airlocks (maybe will remove that)

* changes to HoP access

he couldn't access cargo already, now it's just polished so they don't have weird cargo access that they can't use

* changes Box HoP console to request only (like in the other maps)

* wtf why is this here

* and WHY is this here too???

* Revert "and WHY is this here too???"

This reverts commit 424a53773296eaf261c97992c618c580449f6031.

* Revert "wtf why is this here"

This reverts commit 59fdca38b55ce97ab5bdf28cbea7fb3b9915474e.

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Update PubbyStation.dmm

* Adds plushies from various sources/custom made.

A patch you didn't know you needed.

* More code. Shouldn't break anything.

We'll see if it does.

* Adds a rolled up newspaper sprite

* Adds a child item to the telebaton

identical stats for the future but different looks.

* And a recipe.

You attach a newspaper to a telebaton with tape.

* all the stuff to add pod to code

* The actual map

* Automatic changelog compile [ci skip]

* A

* Automatic changelog generation for PR #14822 [ci skip]

* Automatic changelog generation for PR #14895 [ci skip]

* Automatic changelog generation for PR #14861 [ci skip]

* Automatic changelog generation for PR #14893 [ci skip]

* Automatic changelog generation for PR #14899 [ci skip]

* Automatic changelog generation for PR #14883 [ci skip]

* Okay, let's try this again.

I don't like you, you don't like me,
can we please just get along?

* e

* Automatic changelog generation for PR #14904 [ci skip]

* Automatic changelog compile [ci skip]

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: bunny232 <bunnyracer23@yahoo.com>
Co-authored-by: qweq12yt <45515587+qweq12yt@users.noreply.github.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: WanderingFox95 <75953558+WanderingFox95@users.noreply.github.com>
Co-authored-by: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Co-authored-by: Lin <linzolle@gmail.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
2021-06-30 12:12:52 -03:00
Putnam3145 f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
siliconsandGitHub a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop
Moves tendril KA upgrade disks to blood drunk miner.
2021-06-29 08:51:10 -07:00
siliconsandGitHub c7766b0f02 Merge pull request #14895 from shellspeed1/another-pod
Adds a new survival pod, the penthouse pod.
2021-06-29 08:48:55 -07:00
shellspeed1 26cb16311d A 2021-06-27 20:08:33 -07:00
shellspeed1 f52385ca46 all the stuff to add pod to code 2021-06-27 03:39:13 -07:00
Putnam3145 630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145 fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam3145 c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
SandPoot 167ada9e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-13 23:17:50 -03:00
silicons 8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
zerothebigboy e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
zerothebigboy 3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
SandPoot 03bdaad203 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-19 15:55:34 -03:00
siliconsandGitHub d0bb22da5f Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
2021-05-19 08:02:59 -06:00
shellspeed1 e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
silicons 1585d1c2be fixes 2021-04-26 23:32:33 -07:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
siliconsandGitHub af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
2021-04-18 19:00:14 -06:00
SandPoot 0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
siliconsandGitHub bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
2021-04-08 03:22:46 -06:00
zerothebigboy 657d1f69c8 sex 2021-04-07 04:18:04 -04:00
SandPootandGitHub 2aa2a8c802 actually not that much needed 2021-03-31 20:28:50 -03:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
SandPoot df4779dced upload files 2021-03-29 22:26:34 -03:00
SandPoot 1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
R3dtailandGitHub 0b3773163c Removes Ichor Crates from chest rolls
Does what it says on the tin
2021-03-24 22:20:09 -05:00
LetterN e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
SandPoot d789df5aa9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-20 18:15:07 -03:00
siliconsandGitHub 720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more
Hierophant staff no longer deals 30 damage
2021-03-20 14:32:14 -06:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
SandPoot a8076257a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-18 22:56:09 -03:00
siliconsandGitHub df92faadd4 Update necropolis_chests.dm 2021-03-15 19:05:25 -07:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
SandPoot 82caedb1ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-10 12:26:52 -03:00
Sneakyrat6andGitHub d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
Sneakyrat6 703567e591 other fixes 2021-03-07 04:09:36 -05:00
dzahlus 71cbd8a615 no more free esword 2021-02-26 14:40:00 +01:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00