Commit Graph

414 Commits

Author SHA1 Message Date
SpookyTheFox
c68b33aaad updated to TG
this was fixed a while back, things that destroy walls should also break windows
2022-09-12 22:37:07 -07:00
BongaTheProto
74797a79be Merge branch 'Sandstorm-Station:master' into master 2022-08-05 23:15:43 -05:00
SandPoot
bf0c0f530d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-05 19:09:18 -03:00
Hatterhat
2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
JessieProudmore
6d7f86416d Stun/less-lethal fix
Tweaks to some projectiles and taser electrodes
2022-05-07 20:09:31 +02:00
BongaTheProto
6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
Col.Rice
94f0abed81 Update revolver.dm 2022-04-13 23:27:46 +07:00
Col.Rice
db9708f1c4 Update revolver.dm 2022-04-13 21:05:37 +07:00
BongaTheProto
a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot
9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot
ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Solaris-Shade
c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
BongaTheProto
91efbfc48d Removes walking mushroom
fuck
2022-02-12 18:40:23 -05:00
SandPoot
34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
SandPoot
3da59fc38c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-05 14:27:17 -03:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
SandPoot
1982c3962f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-18 22:03:30 -03:00
kiwedespars
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152)
* 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]

* 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]

* 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]

* 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]

* 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]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-09-17 12:54:02 +02:00
SandPoot
a9e4dd336c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-06 13:58:02 -03:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
SandPoot
86ad617daa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-22 12:40:18 -03: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
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -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
zerothebigboy
fa738856bf i need a nap 2021-06-10 03:22:34 -04:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
2021-06-09 11:29:24 -07:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
WanderingFox95
7884ccf316 Only 5 units are necessary, so why keep it at 10?
I mean, this is the refining process
2021-06-05 14:51:59 +02:00
WanderingFox95
e69729beb4 So he doesn't need sodium thiopental after all.
Turns out Furranium has a knockdown.
2021-05-31 12:15:16 +02:00
WanderingFox95
ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07: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
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
keronshb
41530110a2 LINTER
AHHHH NEW LINE
2021-02-10 20:00:17 -05:00
keronshb
26dfff87fc Slight stat buffs, adds parries and comments
Should be pretty close to 20tc worthy.
2021-01-29 13:17:46 -05:00
keronshb
4346cb937a Fixes merge conflict and makes minor adjustments
TItle
2021-01-29 09:32:28 -05:00
keronshb
a4e933185e Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 09:29:55 -05:00