117 Commits

Author SHA1 Message Date
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot 6d7321b0c4 okay so this is necessary 2024-01-05 22:09:21 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
BongaTheProto 700fd57efb Merge remote-tracking branch 'upstream/master' 2023-12-08 20:22:05 -05:00
SandPoot 42fdd30ba4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-05 17:47:58 -03:00
SandPoot b290efc434 push 2023-11-22 14:11:17 -03:00
Darius 71e83499fc Allow classic pixel shifting
Uncomments the removed lines for pixel shifting verbs, allowing them to be used again.
2023-02-24 19:49:32 -05:00
SandPoot 11a06b1686 pixelshift + layering 2023-02-21 14:27:10 -03:00
SandPoot 992d25ea08 Revert "pixelshift + layering"
This reverts commit 51818478c5.
2023-02-21 14:25:29 -03:00
SandPoot 51818478c5 pixelshift + layering 2023-02-21 14:20:48 -03:00
SandPoot a0c181a721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 15:13:32 -03:00
SandPoot de35e561b5 Update files 2022-01-25 12:52:11 -03:00
SandPoot aac92ef029 Update mob.dm 2022-01-25 12:40:57 -03:00
SandPoot 5f72ad8d61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-11 20:33:04 -03:00
silicons 697ea7ad93 fix 2021-09-27 17:40:53 -07:00
SandPoot 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
silicons e84f7ae4ac fix 2021-06-13 01:16:44 -07:00
silicons 5c44cc22f4 attempt examinate 2021-06-13 00:54:15 -07:00
SandPoot 413909206b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-21 22:23:19 -03:00
Artur 745c825205 Give hotkey, but citadel 2021-01-20 04:21:57 +02:00
SandPoot 766493cc16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-22 18:03:33 -03:00
DeltaFire f75bda735c Merge pull request #13837 from Citadel-Station-13/silicons-patch-31
sprinting now defaults to toggle rather than hold (because 90% of our players probably never check the keybinding preferences and from personal experience, holding down shift to move is awful)
2020-12-22 18:11:02 +01:00
silicons 911e4f7008 Update movement.dm 2020-12-21 21:39:19 -07:00
silicons 0e7a597a2b alright 2020-12-21 10:27:28 -07:00
SandPoot 66ebcce860 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-19 01:07:54 -03:00
silicons 7b0cb7c5a4 FIXED 2020-12-03 22:07:41 -07:00
silicons 8d7f3aebc4 sigh 2020-12-02 09:20:23 -07:00
SandPoot 1c61b39093 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-29 14:21:19 -03:00
silicons ead209f507 sigh 2020-11-27 06:31:05 -07:00
silicons a6d73e0344 fix 2020-11-27 04:25:22 -07:00
silicons 564766d11d sigh 2020-11-27 00:16:53 -07:00
silicons 134fd0f858 k 2020-11-26 23:42:39 -07:00
silicons 5e965d099f COME ON 2020-11-26 23:37:27 -07:00
Timothy Teakettle 285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
Timothy Teakettle 5de801ac40 communication hotkeys 2020-11-22 21:08:58 +00:00
Timothy Teakettle 0c65359f42 functionality 2020-11-22 00:00:24 +00:00
timothyteakettle 60077f028e port 2020-11-17 01:41:19 +00:00
SandPoot 7b935c962c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-15 21:23:24 -03:00
Artur f76c3e922c Comments out spacedmm should not sleeps 2020-11-13 15:18:00 +02:00
SandPoot b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
Ghommie 444a440fba oh 2020-10-25 15:38:36 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
SandPoot 7440566f31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-16 22:55:19 -03:00
BlueWildrose a134bedd4c Fixes subtle hotkey, adds subtler hotkey (#13575) 2020-10-16 17:22:35 +02:00
SandPoot 8128f28be4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:58:53 -03:00
BlackMajor 313970000b Merge pull request #13522 from silicons/async
Fixes the intermittent master controller lockups
2020-10-11 18:48:37 +13:00
SandPoot a680377f37 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-07 19:07:25 -03:00