Commit Graph

1401 Commits

Author SHA1 Message Date
silicons
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
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03: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
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Hatterhat
20087a06a8 superglued stock 2021-10-08 00:15:35 -05: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
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02: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
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
02abdd4eef oh i forgot to commit this before i made the pr 2021-09-30 23:22:45 -05:00
Hatterhat
87e1b80000 adds vareditable clip delay 2021-09-30 23:16:19 -05:00
Hatterhat
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
SandPoot
30c43de717 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-28 11:39:58 -03:00
silicons
b7476491d3 Merge pull request #15204 from Hatterhat/clip-delay
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
2021-09-28 00:13:02 -07:00
Hatterhat
e141df3600 weirdchamp 2021-09-24 23:16:46 -05:00
Hatterhat
fd6e97b935 grr 2021-09-24 23:08:15 -05:00
Hatterhat
784cd2ca7d ballin 2021-09-24 19:12:04 -05: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
75fa42f7c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-31 15:59:51 -03:00
Cognition
fc2e101402 Fixes updates for rechargers & energy guns, ports finish recharging msg 2021-08-28 19:24:29 -07:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07: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
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot
dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -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
1fa4ac60cb i need a nap 2021-06-10 15:16:36 -04: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
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -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
SandPoot
0b42627a61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-03 16:50:59 -03: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
Putnam
9040c08698 whoops i forgot the var 2021-05-30 00:38:07 -07:00
Putnam
2ab05d1247 makes sniper zooming work 2021-05-30 00:31:20 -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
4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
SandPoot
13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
silicons
d4529b1bf3 Merge pull request #14651 from WanderingFox95/WanderingFox95-ReagentDartgunRebalance
The reagent dart gun uplink item needed work.
2021-04-28 21:17:36 -06:00