Commit Graph

526 Commits

Author SHA1 Message Date
SandPoot
6677dfa687 Adds tabs to the interaction menu (#180) 2021-09-06 16:33:35 -03:00
SandPoot
cdbc992e14 Adds an upgrade to engineering borgs (RSD) (#179) 2021-09-05 20:14:09 -03:00
SandPoot
e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
TheLife
77699431f4 Military VOX (#176)
* Military VOX

* Military VOX

* Military VOX moved to Modular Sand

* Update code/modules/mob/living/silicon/ai/say.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/mob/living/silicon/ai/vox_sounds.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/mob/living/silicon/ai/vox_sounds.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2021-08-01 17:12:16 -03:00
SandPoot
b1fc0ee0d3 quick fix 2021-07-29 21:10:30 -03:00
SandPoot
9db7886b7c async 2021-07-28 16:01:59 -03:00
SandPoot
6357753cc1 e 2021-07-28 14:22:56 -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
dd09f0b785 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-19 02:57:23 -03:00
SandPoot
93b374042f Makes borg sleepers use a nicer code and revives janitor module's processor (#174)
* upload files

* Update robot_modules.dm
2021-07-09 15:26:48 -03:00
SandPoot
0d819461e8 Makes handmirrors and give an actual purpose to electric razors (#173) 2021-07-08 15:05:51 -03:00
SandPoot
2819deeb6d Prevents underwear from using direction sprites on the floor (#172) 2021-07-07 13:34:07 -03:00
SandPoot
793435218b Alien parts modularized (#171) 2021-07-05 19:10:22 -03:00
SandPoot
7a2115c5d3 Adds droppers to autolathes and protolathes (#170) 2021-07-03 17:21:12 -03:00
SandPoot
0fcdebb979 very tiny small tweaks 2021-07-02 16:40:37 -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
SandPoot
d863f9f437 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-27 15:54:58 -03:00
SandPoot
70e50583e9 a 2021-06-19 21:33:09 -03:00
SandPoot
e3aeaa173d Updates Interactions (#168) 2021-06-19 00:24:32 -03:00
SandPoot
2dcc7e39c5 Fixes vis_contents being filled with the combat mode flicks (#167)
* update emote.dm

* update emote.dm
2021-06-18 12:43:29 -03:00
SandPoot
11d6d156db Fix cryptominers (#166)
* upload cryptominers.dm

* upload cryptominers.dm
2021-06-03 17:55:04 -03:00
SandPoot
81d9caf948 Fixes custom posters (#165) 2021-06-03 17:38:06 -03:00
SandPoot
31f2f723ec Simple mob aliens drop actual corpses (#164) 2021-06-03 16:47:52 -03:00
SandPoot
309bba8975 Fixes some sprite accesory paths (#161)
* upload files

* this is also wrong
2021-06-03 15:15:51 -03:00
SandPoot
e17dec1980 Doubles hydration gain from liquids (#160) 2021-05-16 14:26:09 -03:00
SandPoot
0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
SandPoot
04ea151153 Adds Loincloths (#159) 2021-05-04 13:22:10 -03:00
SandPoot
80b2785350 Fixes T.E.T.R.I.S (#158) 2021-04-29 19:26:31 -03:00
SandPoot
13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
SandPoot
ee72b01707 Smooth sailing (#157)
* upload files

* upload shuttle_upgrades.dm

* upload files

* upload shuttle_upgrades.dm

* upload files
2021-04-21 21:13:14 -03:00
SandPoot
8cdb28f163 upload files 2021-04-21 20:16:45 -03:00
SandPoot
d186ccfef7 upload files 2021-04-19 00:56:49 -03:00
SandPoot
38bdb3cca3 Many underwear changes (#156)
* upload files

* upload files
2021-04-17 21:04:24 -03:00
SandPoot
27266c67ed A major fix for interactions that can break it a lot (#155) 2021-04-13 23:03:14 -03:00
SandPoot
cc3b66ade5 Telescience general refactor (#154)
* upload temp-files

* progress

* finished, now time for linter check

* already indents some stuff so i don't get many problems

* unused

* let's see

* Missing "key" prop for element in it.react/jsx-key
2021-04-11 20:55:24 -03:00
SandPoot
6d7475881b Some finishing touches at interactions (#153)
* upload files

* Space is required before '}'  object-curly-spacing

* 50:48  error  Missing trailing comma  comma-dangle
2021-04-11 16:02:16 -03:00
SandPoot
aeb14c0a15 TGUI's your interactions (#152)
* upload files

* some indents and keys?

* wrong again?

* indent pain

* 1 error left

* this is joking
2021-04-10 13:16:56 -03:00
SandPoot
0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
SandPoot
342d42e911 bad 2021-04-04 14:02:44 -03:00
SandPoot
9df6b121a5 quick define change and typo fixes 2021-04-04 14:00:48 -03:00
SandPoot
6f15641f33 Thirst (#151)
* upload files

* upload files

* upload examine.dm

* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
SandPoot
48f9d5250b Bluespace miner now affected by stock part tier (#150) 2021-04-02 14:39:10 -03:00
SandPoot
2e568aa90f Cryptomining machines producing money for other bank accounts (#149)
* upload cryptominers.dm

* move this up i guess

* Adds a few visible messages for anyone watching it

* )
2021-04-02 13:01:22 -03:00
SandPoot
795a3b3f39 Gives each department id to their respective head. (#148)
* upload files

* oops, nobody saw this
2021-04-02 00:37:19 -03:00
SandPoot
629f6f99fe The Warehouse (#147) 2021-03-28 20:16:41 -03:00
SandPoot
1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
SandPoot
9d60cd6df5 Alternative job titles (#146)
* upload files

* more titles + fix hydro
2021-03-18 14:12:00 -03:00
SandPoot
4fa8abfca7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-16 18:54:54 -03:00
SandPoot
f1b8802c58 Force gamemode config (#145) 2021-03-10 17:22:04 -03:00