BongaTheProto and GitHub
a257032907
Merge pull request #924 from Tsurupeta/banishing-of-harddels
...
Banishing of harddels
2023-08-15 00:41:11 -05:00
Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
K4rlox
22fa3b5ee4
modified: code/modules/mining/equipment/resonator.dm
2023-07-18 18:44:19 +03:00
K4rlox
cadccf56f1
modified: code/modules/mining/equipment/resonator.dm
2023-07-18 18:43:37 +03:00
K4rlox
76698153e9
nerfs the resonator
2023-07-18 18:42:15 +03:00
K4rlox
ca9be76445
modified: code/modules/mining/equipment/resonator.dm
2023-07-10 12:32:15 +03:00
K4rlox
d8ada81472
new file: code/modules/mining/equipment/resonator.dm
2023-07-10 12:32:15 +03:00
K4rlox
d7274baab5
modified: code/modules/mining/equipment/resonator.dm
2023-07-10 12:27:32 +03:00
K4rlox
525a0421e0
modified: code/modules/mining/equipment/resonator.dm
2023-07-10 00:56:41 +03:00
K4rlox
3f40ec9fef
modified: code/modules/mining/equipment/resonator.dm
2023-07-03 00:12:58 +03:00
BongaTheProto
57a7a516e6
Merge remote-tracking branch 'upstream/master'
2023-03-06 22:43:10 -05:00
SandPoot
d63c2ebdd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-03-05 12:35:35 -03:00
zeroisthebiggay and GitHub
4d72fd3ddf
Update explorer_gear.dm
2023-02-20 22:53:26 -05:00
zerothebigboy
091d9ec00f
good
2023-01-30 00:01:22 -05:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
SandPoot and GitHub
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
SandPoot
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
BongaTheProto
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
SandPoot
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -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
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
SandPoot
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
BongaTheProto
9fe4b25bc9
Merge remote-tracking branch 'upstream/master'
2022-08-27 22:28:10 -05:00
SandPoot
ae3c521bdd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-27 15:58:30 -03:00
silicons and GitHub
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
BongaTheProto
3341812b44
Merge remote-tracking branch 'upstream/master'
2022-08-20 17:16:19 -05:00
SandPoot
550db1b6ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-20 17:27:19 -03: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
BongaTheProto
9e7c5033cc
Merge remote-tracking branch 'upstream/master'
2022-08-07 21:42:16 -05:00
SandPoot
6108e1d522
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 19:46:26 -03:00
Hatterhat
44b23b873d
crusher rename + 350 chr limit descs
2022-08-05 17:41:41 -05:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03: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 and GitHub
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
BongaTheProto
10eb587407
Merge remote-tracking branch 'upstream/master'
2022-04-08 13:46:43 -05:00
SandPoot
31a179f95d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-08 13:57:46 -03: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
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
