Commit Graph
99 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
SandPoot c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
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
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
shellspeed1 2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
Ludox 92ca115ec4 adv plasm cutter is now correctly classified
thank me later :D
2022-02-24 07:22:32 +01: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 RamsayandGitHub 76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
SandPoot 86ad617daa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-22 12:40:18 -03: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 a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons 15dd80a085 less awful 2021-03-20 13:39:59 -07:00
SandPoot c15a3b7a4e changes some comments and var paths to be better? 2021-01-19 13:01:45 -03:00
DrathekandGitHub cd8764b356 Bugfix for Borg Expand Module Unequip (#126)
* Fixed borg expand module double undoing its transform change when deactivated.

(cherry picked from commit c8ab1181530d58c0bd7c0b4d54f39f26b9bf65d5)
2021-01-06 20:10:27 -03:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
DeltaFire d5993539b8 fixes vtec persisting after removal 2020-11-12 16:27:09 +01:00
SandPoot 8cb9f76fd2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-04 00:23:01 -03:00
DeltaFire e012b8f082 typo 2020-10-01 17:18:28 +02:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
SandPootandGitHub 6809afb45c Many borg changes (seriously) (#69) 2020-09-15 23:25:59 -03:00
Letter N 7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
siliconsandGitHub d8a91d9ffa Update robot_upgrades.dm 2020-07-25 02:35:53 -07:00
siliconsandGitHub 62df48b2f0 Update robot_upgrades.dm 2020-07-11 15:11:53 -07:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
Hatterhat 1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Hatterhat 802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
TrilbyspacecloneandGitHub 6993dfde2a Now stocked at your local robotics 2020-03-13 18:29:46 -04:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie f2b04be561 More Runtimenator fixes. 2020-01-25 02:16:45 +01:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
kevinz000 5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
BlackMajor a4d2ea0281 Small fix 2020-01-03 22:39:58 +13:00
BlackMajor 375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
BlackMajor 2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
BlackMajor 206a5e168a More mining changes 2019-12-29 20:15:49 +13:00