Commit Graph
1798 Commits
Author SHA1 Message Date
WanderingFox95andGitHub fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
SandPoot 4b1df1bfb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 10:18:55 -03:00
zerothebigboy 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
SandPoot 3d6ee4e3e6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-08 01:45:49 -03:00
zerothebigboy 3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
keronshb ea3b248e6c Ports Parade outfit changes 2021-09-05 14:17:52 -04:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -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 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur 3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
SandPoot 2761b010c6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-25 22:04:25 -03:00
siliconsandGitHub 224fb7f22c Update tables_racks.dm 2021-07-21 21:34:10 -07:00
siliconsandGitHub d38a775a16 Update tables_racks.dm 2021-07-21 21:33:46 -07:00
WanderingFox95andGitHub 9e9686c0cd Removing unused code altogether. 2021-07-21 19:42:58 +02:00
siliconsandGitHub 16622ac95a Update tables_racks.dm 2021-07-20 18:06:49 -07:00
WanderingFox95andGitHub 36db1c1f87 Removes Recipe Limit 2021-07-20 19:00:29 +02: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 093df245b3 Merge pull request #14930 from keronshb/mirroromenport
Ports Breaking a mirror now gives you a bad omen
2021-07-18 15:06:03 -07:00
SandPoot 9d701320ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-15 11:54:42 -03:00
keronshb c92952c3b0 Cit changes for bullet path 2021-07-06 22:57:31 -04:00
keronshb fc153b04d3 breaking a mirror is bad for your health (#58381) 2021-07-06 22:47:02 -04:00
Putnam3145 899e74fc83 Componentized acid 2021-07-03 22:10:44 -07: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
LinandGitHub 0bfb671f4e Merge pull request #14482 from silicons/combat_v7
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
SandPoot d863f9f437 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-27 15:54:58 -03:00
Putnam3145 fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
Putnam3145 dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -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
siliconsandGitHub 431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
SandPoot 91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
siliconsandGitHub fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -07:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
SandPoot 002be6d415 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-31 12:39:32 -03:00
siliconsandGitHub cb52be5dd9 fixes linter warnings (#14778)
* woo

* woo
2021-05-31 10:19:20 -05:00
SandPoot ef64fcef65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-28 01:17:25 -03:00
keronshb 13b589507d Clown Spawner
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb 7458909970 Switched heated screws to solder. 2021-05-23 13:36:03 -04:00
keronshb 8787caccba Fixes the roundstart deconstruction issue 2021-05-22 14:12:31 -04:00
keronshb bd05dd29b6 ReinforcedPlasmaSteps
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04:00
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
SandPoot 34b491337c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-12 13:18:49 -03:00
siliconsandGitHub 5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00