Commit Graph

299 Commits

Author SHA1 Message Date
evilew
9d9f805d7b Merge branch 'master' into gatofication2 2024-11-21 22:11:24 +01:00
evilew
bdccf133cb load of fixes
- increased age_min from 18 to 21
- gave RCDs an option of airlock direction
- buffed bluespace trays
- made more windows / walls directional and merging with airlocks/windows
- gave the rusty walls perspective sprites
- removed stoner language from beach bum
- enabled prisoner (for now)
- buffed HEVA not to be weak to goliaths
- brought back smaller, more realistic bee sprites
2024-11-20 15:51:04 +01:00
evilew
10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew
edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
deathride58
0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
SandPoot
676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot
a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot
76e7ffc80d push 2024-01-06 17:36:02 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
zeroisthebiggay
4d72fd3ddf Update explorer_gear.dm 2023-02-20 22:53:26 -05:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPoot
f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Hatterhat
282cc819dc works on my machine 2022-10-04 20:10:09 -05:00
Hatterhat
38bd037b66 box that mf up 2022-10-04 14:14:04 -05: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
silicons
4a6358d2f4 Merge pull request #15806 from shellspeed1/new-mining-pods
Penthouse pod rework plus new garden pod.
2022-08-26 10:18:13 -07:00
shellspeed1
d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
shellspeed1
f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
zerothebigboy
4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04:00
zerothebigboy
f39de3b781 yeah 2022-08-09 13:26:13 -04:00
Hatterhat
44b23b873d crusher rename + 350 chr limit descs 2022-08-05 17:41:41 -05: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
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
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
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Hatterhat
0077f682fd crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458)
* boo womp

* wrongsonator

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2022-01-09 18:46:48 +01:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
silicons
a14549d07b Merge pull request #15299 from Hatterhat/cgau
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
Hatterhat
7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
Emily
57950045a7 Fixes the sprites for wielding. 2021-10-20 10:06:14 +02:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy
5206524dd4 gommit 2021-09-02 07:38:48 -04:00
WanderingFox95
97e4b7aef9 Apply suggestions from code review
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
2021-07-21 19:58:58 +02:00
WanderingFox95
fabd42be43 lowercase items #2 2021-07-20 23:00:55 +02:00
WanderingFox95
1af648dd47 Bone Spade & Glaive 2021-07-20 18:56:10 +02:00
silicons
c7766b0f02 Merge pull request #14895 from shellspeed1/another-pod
Adds a new survival pod, the penthouse pod.
2021-06-29 08:48:55 -07:00
shellspeed1
f52385ca46 all the stuff to add pod to code 2021-06-27 03:39:13 -07:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
shellspeed1
e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00