Commit Graph

155 Commits

Author SHA1 Message Date
Pinta
6dcab06780 more changes 2024-03-24 06:54:57 -04:00
Pinta
63009681fa it compiles, that's better than it not compiling, right? 2024-03-24 06:36:59 -04:00
Pinta
d46cf2d981 a start 2024-03-24 05:20:10 -04:00
evilew
c7d76c9941 porting sprites, giant pizza, removing valentines
should've chopped those commits but eh, essentially does what it says it does
2024-02-16 16:44:30 +01:00
Aeris Bennet
7c64f8b301 Did as much as I can with adding more GATO branding. 2024-02-09 02:29:29 +00:00
evilew
b188d9dc12 quick fix
forgor about one detail
2024-01-17 17:49:23 +01:00
evilew
013081b61e made modular jumpsuits available
to loadout, clothing vendor and cargo. Also removed nuke disk message spam for admins
2024-01-17 16:18:43 +01:00
Aeris Bennet
8d2e08eb65 Some final cleanup of the hunter stuff. Purged because it wasn't used. 2024-01-16 18:35:14 +00:00
psq95
cb43bf0dfc Label GS13 changes
Since commit 5084020 on Jan 30, 2023
2023-08-29 21:50:24 +01:00
psq95
5840c8ab99 Add null checks to client prefs checks
client.prefs. -> client?.prefs?.
2023-05-13 23:53:47 +01:00
Sonoida
f303300f6e fixed the sleep damage eye blur effect
woo! yippie
(also renamed some of my older comments)
2023-04-06 20:55:08 +02:00
Sonoida
79b156ca6b fixing someone's errors
what a goober, amirite
2023-02-16 17:53:28 +01:00
GDLW
34a89c1687 Merge pull request #61 from eyespy2222/testbranch
DID I HEAR A ROCK AND STONE?!?!?!!?!
2023-02-16 12:16:21 +01:00
eyespy
29756d756b Revert "Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!""
This reverts commit 544605fca6.
2023-02-16 18:03:22 +11:00
eyespy
544605fca6 Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!"
This reverts commit 99b80d9784.
2023-02-16 18:01:12 +11:00
eyespy
99b80d9784 DID I HEAR A ROCK AND STONE?!?!?!!?!
FOR KARL!!
2023-02-16 17:48:49 +11:00
DynaJ0ule
d342f3f628 Comment clarification 2023-02-06 12:41:35 -05:00
DynaJ0ule
5209413204 Merge branch 'origin/HEAD' 2023-02-06 12:31:43 -05:00
Sonoida
1433321ad0 small tweaks
- fixed some floor tiles in Xenoarch
- scrubbed radstorms, heart attacks and random appenditicis from event pool
- increase pancake stacking from 10 to 20
- removed a couple pixels from Nia / Long Hair 1 hairstyle (they were colliding badly with bellies and other organs
- tweaked pod people to give them more body parts
- Rose now starts with a rose :)
2023-01-31 00:06:49 +01:00
Sonoida
a7b062e7af VV's WG sprites!
Thank you VV for making these. I'll tweak them a bit later to make sure everything is finished but this is the main thing.

Also this commit includes nuclear bomb message tweak because I forgot to put in a seperate commit, oops
2023-01-30 19:54:47 +01:00
GDLW
1c0311b77c Merge branch 'KabKebab:master' into minor_reworks 2023-01-21 20:20:00 +01:00
DynaJ0ule
8da38160f3 Sleep tight, disky. No operatives if disk sleeps. 2023-01-20 11:04:55 -05:00
Sonoida
aa7a347f76 more small mapping changes, sprite fixes and lil rule tweak
- added runtime v2 to Pubby
- added Moka's room to CC
- fixed teleporter in Demone station, made the place a lil prettier
- max amount of Nuke Op occurences is 3, rather than limitless
- rewrote Employment Contract to be a lil bit less evil
- edited out more bits of Kinaris (CAS cards, popcorn, bedsheets)
2023-01-12 15:17:42 +01:00
DynaJ0ule
003ecd8710 adds a new symptom to infect robotic hosts 2023-01-11 16:53:39 -05:00
MrSky12
e440cd4746 Added the ability for the virus to have the weight gain string 2022-11-29 20:57:41 +01:00
GDLW
3e31b47490 edited out more kinaris stuff
also tried doing something with computer UIs background, but I have no idea how to change it up tbh. Truly a mystery
2022-11-02 13:04:11 +01:00
MrSky12
da87e88321 Gatofication 2 2022-06-03 00:07:56 +02:00
Archie
d20013cfe4 Login loss prevention v1 2021-09-23 19:37:06 -03:00
kevinz000
21c3b8e67b Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
2021-07-15 17:56:19 -03:00
kevinz000
865ff4fa08 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2021-07-15 17:43:18 -03:00
Dahlular
81725f27c0 Merge pull request #1323 from ArchieBeepBoop/fuck512
Component Updates - Taking 512 compatibility out back and beating it with a stick
2021-07-15 08:08:03 -06:00
Archie
24fec32815 OpFix 2021-07-04 02:30:34 -03:00
Archie
c26d02207a Merge remote-tracking branch 'upstream/master' into fuck512 2021-06-28 03:32:04 -03:00
kevinz000
cf0105de4a Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2021-06-27 14:03:06 -03:00
kevinz000
470cb0a588 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2021-06-25 21:06:34 -03:00
Archie
685eceb594 sentient viruses can now infect synths and ipcs (fastest salt in the west) 2021-06-18 02:26:37 -03:00
Archie
5793aeffa8 Minor status tab fixes 2021-06-16 17:13:58 -03:00
Archie
20b7ed80a1 Fixes the nothing objective 2021-06-15 20:41:52 -03:00
Archie
efa78a3433 a 2021-06-14 00:43:41 -03:00
Archie
5a7af7c317 Specify? 2021-06-14 00:41:33 -03:00
Archie
4917acf373 Don't need to specify. 2021-06-14 00:41:04 -03:00
Archie
8073f77d69 Threshold, broadcast 2021-06-14 00:40:03 -03:00
Archie
8a3d26fa26 Some rev changes 2021-06-11 21:15:31 -03:00
Dahlular
dc2957900c Merge pull request #1201 from ArchieBeepBoop/stargazerfix
Makes Stargazers work on Layenia too
2021-06-01 04:18:54 -06:00
Archie
78808ad2b3 Stargazes wll also detect cloud turfs for their calculations 2021-05-24 02:53:43 -03:00
Archie
f478ec14a3 disky spam fix 2021-05-23 04:55:27 -03:00
Lin
58ebfe465f Merge pull request #14023 from Citadel-Station-13/silicons-patch-8
the disk now snores every minute instead of every 2 seconds
2021-05-23 04:36:51 -03:00
silicons
d4db51175f Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-05-23 04:36:37 -03:00
Dahlular
f9aeac6d5c Merge pull request #1141 from DragonTrance/various-misc-2
Fixes antagonists being unable to hear code phrases and responses, and other misc hearing stuff
2021-05-09 20:35:44 -06:00
DragonTrance
152d2d33bb Fixes antagonists being unable to hear code phrases and responses
Ports Citadel-Station-13/Citadel-Station-13#10033 and Citadel-Station-13/Citadel-Station-13#10976
2021-05-08 18:58:36 -07:00