Commit Graph
136 Commits
Author SHA1 Message Date
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPoot d337852c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-28 16:56:04 -03:00
HatterhatandGitHub 50a0991ce3 minor point dupe kill 2022-12-26 12:00:54 -06:00
Demidisco 4411efa3bd Updating vending machine fixing infinite point exploit, updated Kilo Cargo shuttle to feature tiny fans to standardize it with the rest, fixed door in security double door entrance which was preventing heads from using it 2022-12-25 09:24:05 +01:00
SandPoot ba6d614e6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-11-09 20:50:44 -03:00
Hatterhat bab984be30 i hate runtimestation i hate runtimestation 2022-10-31 11:50:54 -05:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
shellspeed1andGitHub 142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
shellspeed1 2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
shellspeed1 22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1 d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
SandPoot ae3c521bdd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-27 15:58:30 -03:00
siliconsandGitHub 4a6358d2f4 Merge pull request #15806 from shellspeed1/new-mining-pods
Penthouse pod rework plus new garden pod.
2022-08-26 10:18:13 -07:00
shellspeed1 d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
shellspeed1 f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
DeltaFire 6aa906395c not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
Hatterhat 5dbadffe6b wait a fucking second 2021-10-23 18:15:20 -05:00
Hatterhat 21f88e9711 sounb 2021-10-23 17:47:31 -05:00
Hatterhat 73bbe4f694 igons 2021-10-23 17:47:06 -05:00
Hatterhat 4559b680fd whoops 2021-10-22 22:07:10 -05:00
Hatterhat 7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05: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
shellspeed1 f52385ca46 all the stuff to add pod to code 2021-06-27 03:39:13 -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
shellspeed1 e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
SandPoot 08f8360f31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-06 23:10:33 -03:00
Hatterhat 4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
SandPootandGitHub f4165e6dbb Kinectic Destroyer (#40) 2020-08-09 19:40:38 -03:00
siliconsandGitHub f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
Hatterhat e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Hatterhat ccee254546 proof of concept: crusherglaive - squashed 2020-08-02 12:30:14 -05:00
Letter N 0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
jjpark-kbandGitHub 99425bbd88 Radial Mining Vendor Voucher (#12246) 2020-05-14 13:59:40 +02:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
TrilbyspacecloneandGitHub 1472ea31a0 oops all the missing commas 2020-05-08 07:19:03 -04:00
TrilbyspacecloneandGitHub b5010c5cfc Update machine_vending.dm 2020-05-08 06:49:26 -04:00
Artur 120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00