Commit Graph
1577 Commits
Author SHA1 Message Date
SandPoot 5f72ad8d61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-11 20:33:04 -03:00
Putnam3145andGitHub b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking
fixes afk detection
2021-10-11 15:52:03 -07:00
Putnam3145andGitHub 3209917830 Merge pull request #15173 from silicons/vpn_block
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
2021-10-11 15:51:52 -07:00
SandPoot 2541ad050b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-10 21:07:48 -03:00
SandPoot 3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons 0ec7e92f82 that too 2021-09-27 17:44:14 -07:00
silicons 697ea7ad93 fix 2021-09-27 17:40:53 -07:00
silicons ae513d3114 feautre 2021-09-17 21:58:26 -07:00
SandPoot b1494b4f91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 21:39:06 -03:00
LetterN 791da1b9b4 mafia update. 2021-09-11 11:38:15 +08:00
SandPoot f7e29d0cb2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 14:50:33 -03:00
siliconsandGitHub ead04910c2 Update preferences_savefile.dm (#15108) 2021-09-09 18:23:01 +02:00
SandPoot e3c17dc05e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 01:57:47 -03:00
siliconsandGitHub 69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
LinandGitHub 9b888c7b01 Merge pull request #15059 from timothyteakettle/language-fixies
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
timothyteakettle a33a7ed249 fix 2021-09-01 17:54:14 +01:00
SandPoot e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
SandPoot b2ef076043 Upload files 2021-08-26 16:44:36 -03:00
keronshb 7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur 4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot dd09f0b785 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-19 02:57:23 -03:00
siliconsandGitHub 24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
SandPoot 3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
timothyteakettle 39c09a60b8 initial commit 2021-07-13 23:45:31 +01: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
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
Timothy Teakettle da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01:00
Timothy Teakettle 6d13f09c3d Update preferences.dm 2021-05-17 11:20:47 +01:00
Timothy Teakettle 4cb0eb3418 Update preferences.dm 2021-05-17 10:59:26 +01:00
Timothy Teakettle 80d287abca index magic moment 2021-05-16 03:10:35 +01:00
timothyteakettle 7560898f94 Update preferences.dm 2021-05-10 22:53:27 +01:00
Timothy Teakettle 60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
Timothy Teakettle 24774856bc Update preferences.dm 2021-05-10 14:34:22 +01:00
Timothy Teakettle cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle 6926ea74ab Update preferences.dm 2021-05-10 13:58:53 +01:00
Timothy Teakettle d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
SandPoot 0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
Timothy Teakettle 022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle 42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
Timothy Teakettle 149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle 5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle 5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle 108ff3d2f4 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-08 01:27:22 +01:00
SandPoot a9ae7d0930 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-07 15:58:07 -03:00
timothyteakettle 0fb72497ff color fix 2021-05-07 16:46:40 +01:00