Commit Graph
134 Commits
Author SHA1 Message Date
SpookyTheFoxandGitHub bc0c929104 added a magazine name
hopefully fixes this, I don't like seeing null ref exceptions
2022-08-19 15:39:17 -07:00
BongaTheProtoandGitHub 74797a79be Merge branch 'Sandstorm-Station:master' into master 2022-08-05 23:15:43 -05:00
Hatterhat 2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
Toxici11iandGitHub d836bcf147 Fixes bug with super-expensive shotgun 2022-05-06 20:43:02 +01:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
radar651 f816373439 Ready for merg
At least I hope so
2022-03-26 05:21:06 -05:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot ecee82ed75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-12 12:55:02 -03:00
siliconsandGitHub 91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box
The Yeehaw Update - makes .38 lever-actions slightly more accessible
2021-10-11 20:45:42 -07:00
SandPoot 2c4fcaba81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-06 15:04:36 -03:00
Chayse Ramsay 4d2e81d73c newline 2021-10-05 02:52:50 +01:00
Chayse Ramsay 6f0722ab48 Ammo box sprite fixed 2021-10-04 18:36:17 +01:00
Hatterhat 1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -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
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
SandPoot 0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
silicons 275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
The0bserver 6b4051071d Finally, ammo for the funny gun. 2021-04-21 10:46:04 -04:00
The0bserver 146ffcd2bd tweaks 2021-04-21 09:58:08 -04:00
The0bserver db046f3dbb I want to play Thermonuclear War (Initial Commit) 2021-04-21 03:12:01 -04:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
The0bserver f16c6931e2 Fixes, removes the functionality after confering. 2021-04-13 23:50:11 -04:00
The0bserver 27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver 64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver 1d31fb084f More concealment, fixes a problem with the .45-70 2021-04-11 19:40:54 -04:00
The0bserver 9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver bdaf0987e4 im going insane 2021-04-11 05:31:23 -04:00
The0bserver e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver 55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
SandPoot 73c0ff2f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-24 23:57:03 -03:00
Hatterhat 30a9ad5059 yeehaw :) 2021-03-23 18:55:00 -05:00
Hatterhat 6bac90f8de uhh initial commit ig 2021-03-22 21:23:00 -05:00
silicons 15dd80a085 less awful 2021-03-20 13:39:59 -07: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
dzahlus 594aa9b3c0 sorry no funny taser 2021-03-03 01:34:19 +01:00
dzahlus d214392a9c Update rechargable.dm 2021-03-02 18:18:23 +01:00
dzahlus f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
SandPootandGitHub 13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
siliconsandGitHub adc75a1d50 Merge branch 'master' into revert-13122-haha 2020-08-28 15:31:38 -07:00
siliconsandGitHub ff6beea525 rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm

* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
lolman360 ee4da21d38 Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha 2020-08-19 12:20:38 +10:00
lolman360 f35989b09e Merge remote-tracking branch 'upstream/master' into haha 2020-08-19 12:20:07 +10:00
09bba25050 Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:45 +10:00