BongaTheProto
2d1d665e41
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit c1c9fef2246767f48e82
2023-12-16 10:48:35 -05:00
BongaTheProto
c1c9fef224
Merge remote-tracking branch 'upstream/master'
2023-12-15 18:12:47 -05:00
SandPoot
8cdb82a23f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-12 22:06:13 -03:00
SandPoot
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
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
Comicao1
35be2259e1
Update mine_items.dm
2023-06-23 20:55:00 -03:00
Comicao1
12e78a689b
Update mine_items.dm
2023-05-31 18:57:04 -03:00
Comicao1
91f2d395c1
Qew
2023-05-27 03:59:00 -03:00
Comicao1
0473bfca9b
Update mine_items.dm
2023-05-08 03:17:00 -03:00
Comicao1
44f8522120
Requested
2023-03-22 17:34:10 -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
BongaTheProto
ab9d691f1a
Merge remote-tracking branch 'upstream/master'
2023-01-09 16:59:38 -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
SandPoot
42d4abc164
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 16:44:44 -03:00
SandPoot and GitHub
535c1c623e
Merge pull request #15896 from LeDrascol/fix-machine-init-process
...
Fix init_process not preventing processing
2023-01-07 15:44:58 -03:00
SandPoot
d337852c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-28 16:56:04 -03:00
Darius
b8079b108f
Move furnace init variable
...
Moves the init_process variable above the var defines to drastically improve style.
Requested by SandPoot.
2022-12-26 22:35:22 -05:00
Hatterhat and GitHub
50a0991ce3
minor point dupe kill
2022-12-26 12:00:54 -06:00
Demidisco
4411efa3bd
Updating vending machine fixing infinite point exploit, updated Kilo Cargo shuttle to feature tiny fans to standardize it with the rest, fixed door in security double door entrance which was preventing heads from using it
2022-12-25 09:24:05 +01:00
Darius
dae235f97c
Selective mineral machine init_process
...
Requested by SandPoot. Disables init_process for mineral (mining) machines, and enables it on a case-by-case basis.
Downstream mineral machines must be updated with this change.
2022-12-23 16:16:57 -05:00
Darius
bcae0e66ff
Fix init_process not preventing processing
...
Prevents machines from running faster when set to both not init_process and not speed_process.
Changes mineral machine to init_process to fix potential issues caused by this.
2022-12-16 16:25:45 -05:00
BongaTheProto and GitHub
a1c93d4767
Merge branch 'Sandstorm-Station:master' into master
2022-11-09 19:12:06 -05:00
SandPoot
ba6d614e6a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-11-09 20:50:44 -03:00
Hatterhat
bab984be30
i hate runtimestation i hate runtimestation
2022-10-31 11:50:54 -05: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
silicons and GitHub
f7937e54e0
Merge pull request #15860 from shellspeed1/public-bounties
...
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
silicons and GitHub
d91100c0f2
Merge pull request #15867 from Hatterhat/fists
...
[READY FOR REVIEW] [FRAMEWORK] kinetic brawling - the kinetic gauntlets rework nobody asked for
2022-10-08 19:57:37 -07: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
e1cb9c8346
Merge remote-tracking branch 'upstream/master'
2022-09-27 23:19:10 -05:00
SandPoot
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
shellspeed1 and GitHub
142c07c51d
Merge branch 'master' into premium-kas-for-borgs
2022-09-23 17:00:02 -07:00
silicons and GitHub
96384ac667
Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return
...
Fixes the mining borg point card
2022-09-23 16:24:36 -07:00
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
shellspeed1
3dace329be
adds public bounty consoles without inflation, also removes the mint
2022-09-17 19:27:40 -07:00
BongaTheProto