483 Commits

Author SHA1 Message Date
evilew
d120128125 boobencocken
- ported over HS13 cock and boob sprites
- made bigger cock / boob sizes available
2024-11-22 20:45:45 +01:00
Metis
a10d870908 Update server.txt 2024-10-20 13:25:27 -04:00
Metis
78f472ff0f updates tick rate 2024-10-19 18:53:55 -04:00
Metis
75b717d7fa Merge remote-tracking branch 'upstream/master' 2024-10-15 13:22:30 -04:00
Metis
50e2d911a6 Update general.txt 2024-10-15 00:26:38 -04:00
Metis
0e3649bea5 I am dumb 2024-10-11 15:34:57 -04:00
Metis
82a4c7c51f Update movespeed.txt 2024-10-09 18:21:58 -04:00
sheepishgoat
7fc87cbc2d Merge pull request #1 from sheepishgoat/mapping-tweaks
config tweaks
2024-10-08 21:51:48 -04:00
Metis
b8b3d603c4 border 2024-10-07 20:21:02 -04:00
Metis
67abb32511 Update motd.txt 2024-10-02 13:13:36 -04:00
Metis
28bdefb908 motd 2024-10-02 10:26:34 -04:00
evilew
9950e38d03 doing stuff with title screens + configs 2024-09-24 22:26:57 +02:00
evilew
bced8089c5 config tweaks
probably might make things more confusing but some of these things are just universally better used by default
2024-09-24 21:54:27 +02:00
Metis
ecf23a205e size fixed (mostly) 2024-09-15 22:31:19 -04:00
Metis
77d4225990 you can now get fat! 2024-09-14 20:50:15 -04:00
DJKouta
5dc2241d6a Syndicate Skinned Box Station (#15580)
* Syndicate Skinned Box Station

* Create syndicatestation.json

Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE.  HERES THE JSON!

* actually makes this work

* random runtime

we lvoe lesser-used items with runtiming actions

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2023-11-13 12:48:38 +01:00
SandPoot
a105852042 the stuff
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
2023-10-05 21:15:11 -03:00
shellspeed1
d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

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

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

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

* Update code/modules/power/reactor/rbmk.dm

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

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

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

* Update code/modules/power/reactor/rbmk.dm

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

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
Lin
becb035529 Merge pull request #15632 from deathride58/botrefresh
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
2022-06-01 21:18:10 +00:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
deathride58
ccc5ea1758 Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role 2022-05-19 15:19:21 -04:00
deathride58
8838fcc2f3 Moves server_taglines.txt to config dir to avoid requiring manual updates of the strings folder with TGS 2022-05-12 17:22:52 -04:00
deathride58
40730237f2 Hub refresh - Cleans up update_status(), adds more hub-related config options, and more! 2022-05-05 14:52:53 -04:00
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

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

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot
e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot
96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot
37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
SandPoot
fdb6413d23 You guys want some logs? 2022-03-16 15:22:04 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
DeltaFire
2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
SandPoot
80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb
6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb
1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
SandPoot
f03b83e89b Update server.txt 2021-10-13 15:12:52 -03:00
SandPoot
5153dba0f2 Upload files 2021-10-13 15:11:25 -03:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
2021-10-11 15:51:52 -07:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
keronshb
af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
zeroisthebiggay
5366a09c8b Update spaceRuinBlacklist.txt 2021-09-24 18:38:58 -04:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00