Commit Graph
35 Commits
Author SHA1 Message Date
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
SandPoot 23ac8a1963 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-14 11:30:47 -03:00
siliconsandGitHub e252e073a1 Update stamina_combat.dm 2020-12-11 03:06:29 -07:00
SandPoot 8aad78b784 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:44:06 -03:00
SandPootandGitHub 13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
silicons 15d04caa43 okay 2020-09-22 21:59:33 -07:00
silicons 7249fe058f config based 2020-09-21 17:36:30 -07:00
silicons 86ca2cb905 amends 2020-09-20 13:38:36 -07:00
silicons 8a54395f1a fixes 2020-09-20 04:33:49 -07:00
silicons 3505a5bc18 fixes 2020-09-20 02:10:54 -07:00
silicons 8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
silicons de3227e3e0 fix 2020-08-04 22:55:33 -07:00
silicons 0a36f9fbb5 changes 2020-08-04 22:40:28 -07:00
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -07:00
kevinz000 c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000 0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000 588443e928 fix 2020-05-30 20:12:50 -07:00
kevinz000 e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000 6b0b20b171 infinite loop protection 2020-05-30 01:00:41 -07:00
kevinz000 05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000 ae9fc5789d adds more support to stuff 2020-05-30 00:35:17 -07:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000 95c6c7345c implementations 2020-05-24 14:56:01 -07:00
kevinz000 4be522ff30 more bitflag memes 2020-05-07 09:02:03 -07:00
kevinz000 7d17da1bac stuff 2020-04-28 23:51:49 -07:00
kevinz000 238665f464 progress 2020-04-11 09:13:10 -07:00
kevinz000 8132db65b1 interrupt funtion 2020-04-11 05:59:11 -07:00
kevinz000 8fe064da74 save memory.. 2020-03-26 14:13:18 -07:00
kevinz000 135ca27281 parry 2020-03-26 13:08:05 -07:00
kevinz000 289d581e66 ok bet 2020-03-26 12:19:09 -07:00
kevinz000 92b809634b k 2020-03-26 11:32:18 -07:00
kevinz000 825adfa29f whew 2020-03-25 21:23:54 -07:00
kevinz000 13a8e7a777 k 2020-03-25 21:06:01 -07:00
kevinz000 2e0992dbb9 k 2020-03-24 19:29:54 -07:00