91a9223df6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-25 17:08:42 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
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
46384d2a67
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-07 03:36:25 -03:00
76e7ffc80d
push
2024-01-06 17:36:02 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d63c2ebdd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-03-05 12:35:35 -03:00
4d72fd3ddf
Update explorer_gear.dm
2023-02-20 22:53:26 -05:00
091d9ec00f
good
2023-01-30 00:01:22 -05:00
2a772c8482
Adds the commando skin from ror & ror2 to the mining hardsuit ( #280 )
...
* first commit with everything
* quick fix and little extra usage!
* the boy
* previous could break
* better head
2023-01-09 18:55:07 -03:00
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
282cc819dc
works on my machine
2022-10-04 20:10:09 -05:00
38bd037b66
box that mf up
2022-10-04 14:14:04 -05:00
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
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
ae3c521bdd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-27 15:58:30 -03:00
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
d175b4d247
capitalization stuff
2022-08-24 15:13:19 -07:00
f030d0038f
New garden pod
2022-08-21 05:00:26 -07:00
550db1b6ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-20 17:27:19 -03:00
4c2fc18a0a
cheesed to meet you
2022-08-10 11:13:58 -04:00
f39de3b781
yeah
2022-08-09 13:26:13 -04:00
6108e1d522
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 19:46:26 -03:00
44b23b873d
crusher rename + 350 chr limit descs
2022-08-05 17:41:41 -05:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
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
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
31a179f95d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-08 13:57:46 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
086e3bc704
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-09 23:40:45 -03:00
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
ed053988d8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-24 22:11:23 -03:00
5b85c260a7
Upload files
2021-11-15 01:34:30 -03:00
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
a14549d07b
Merge pull request #15299 from Hatterhat/cgau
...
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
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
0afe5a098b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-24 12:27:46 -03:00
7fb3666f43
funny hands gaming
2021-10-22 22:05:18 -05:00
57950045a7
Fixes the sprites for wielding.
2021-10-20 10:06:14 +02:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
be2a85d9d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-03 15:41:30 -03:00
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
SandPoot