Commit Graph

275 Commits

Author SHA1 Message Date
BongaTheProto
79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -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
Hatterhat
38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
Toxici11i
20aae36da7 Blood-drunk changes 2022-05-08 09:36:27 +01:00
Toxici11i
480dc34671 wah 2022-05-07 07:33:55 +01:00
Toxici11i
8f91555dd7 Massive update.
Signed-off-by: Toxici11i
2022-05-06 22:29:33 +01:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
silicons
da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot
13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02: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
31a179f95d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-08 13:57:46 -03:00
Artur
be46eba465 Moves stasis handling to component-based 2022-04-07 14:10:51 +03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
SandPoot
04231b54f3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-17 22:46:31 -03:00
SandPoot
4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot
07fe9bdbca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-14 15:09:35 -03:00
silicons
861a9f854f Merge pull request #15476 from DeltaFire15/core-alt-pr
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
2022-03-13 14:26:06 -07:00
SandPoot
5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot
7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
DeltaFire
1d1a153808 buffnerf
buffs cores for robots on lavaland
nerfs cores when not on mining z
2022-01-22 19:17:05 +01:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04: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
7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
keronshb
8cb16aa0f3 Fixes item transfers 2021-10-14 17:26:17 -04:00
keronshb
13140f9bb9 Somewhat fixed huds and stuff, not 100% 2021-10-14 16:36:18 -04:00
keronshb
6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
SandPoot
d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
silicons
aa7a376dd5 removes DoT 2021-09-12 20:10:01 -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
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03: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
0069f12c6f errors 2021-06-28 13:17:14 -07:00
silicons
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
SandPoot
c48360be5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-19 10:20:49 -03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons
8fe45263c5 whew 2021-04-26 22:58:30 -07:00
silicons
7ccb5bc711 fixes 2021-04-26 14:21:59 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
SandPoot
93a3b6dac1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-21 14:58:45 -03:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
SandPoot
0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
Blue Wildrose
e29beaf852 I'll use this linter error as an opportunity to fix some grammar 2021-04-03 11:26:35 -07:00