Jerry Wester
0adf590336
Safeguard suit
2023-01-20 20:25:59 -07:00
Jerry Wester
ccc6fb0870
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits
2023-01-20 17:10:49 -07:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
9098fbee8d
Update code/game/objects/structures/electricchair.dm
...
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com >
2023-01-15 03:01:03 +00:00
Casper
ae399d1d7c
Fixes e-chair and shockkit runtimes.
2023-01-14 22:13:00 +00:00
President of Shit PRS
d063144713
Re-Adding Bounty Consoles
...
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
Timothy Teakettle and GitHub
35d01aa0f4
Merge pull request #15918 from LeDrascol/port-heirloom-update
...
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03:00
Timothy Teakettle and GitHub
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac
puts pda in the system to remove shitcode
2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7
element time
2023-01-10 18:08:17 -03:00
Jerry Wester
549482770c
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits
2023-01-09 22:42:25 -07: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
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
SandPoot
f066a260f2
previous could break
2023-01-09 08:05:48 -03:00
SandPoot
c94aa43432
quick fix and little extra usage!
2023-01-08 22:02:30 -03:00
SandPoot
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
Jerry Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
d527d28ef7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 22:58:19 -03:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
Lin and GitHub
efb2d19cb9
Merge pull request #15921 from LeDrascol/port-furrypride-graffiti
...
[PORT] Furry Pride graffiti
2023-01-07 16:38:34 -07:00
silicons and GitHub
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot
42d4abc164
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-07 16:44:44 -03:00
Jerry Wester
63aa6294dd
whitespace should not be syntax grrr
2023-01-07 06:41:05 -07:00
Jerry Wester
21b0a9d222
move rescue plating to CMO locker
2023-01-07 06:23:53 -07:00
Darius
4bea655c8b
Port Furry Pride graffiti
...
Ports the large "Furry Pride" graffiti from TG.
2023-01-05 17:38:02 -05:00
Lin and GitHub
b5d794a6b3
Merge pull request #15916 from LeDrascol/mop-sprite-fix
...
Fix Advanced Mop inhands sprite
2023-01-04 21:50:54 -07:00
Darius
d90fa375e1
Move heirloom lists to relevant files
...
Port of the current TG heirloom system.
Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.
Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
Darius
e5813bec20
Play BSLR effects only when replacing
...
Prevents the Bluespace Light Replacer from playing sounds or displaying a beam when the target's light won't be replaced. Based on the BSRPED's behavior.
2023-01-03 14:36:56 -05:00
Darius
7dc500e526
Fix Advanced Mop inhands sprite
...
Restores the sprite to it's unique advmop variant, and fixes a sprite order issue.
2023-01-03 13:10:48 -05:00
BongaTheProto
8034d9fb22
Merge remote-tracking branch 'upstream/master'
2022-12-31 14:31:12 -05: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
d3e018720c
Port the Bluespace Light Replacer
...
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
2022-12-24 15:57:11 -05:00
Jerry Wester
25fb98f5e8
remove signals_atom_movable.dm, revert jetpack
2022-12-20 20:16:59 -07:00
Jerry Wester
d3c72669d9
clean up & remove longfall boots
2022-12-20 02:03:45 -07:00
Jerry Wester
892ee93e15
clean up & remove longfall boots
2022-12-19 23:07:06 -07:00
Jerry Wester
b1b4f96053
fix hilbert analyzer in RD locker
2022-12-17 20:10:41 -07:00
BongaTheProto
a04476b38d
Merge remote-tracking branch 'upstream/master'
2022-12-16 20:39:53 -05:00
SandPoot
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
Jerry Wester
b52e7a5657
ion jetpack module
2022-12-14 23:36:47 -07:00
Jerry Wester
05d17205e7
ion jetpack module
2022-12-14 20:24:54 -07:00
Lin and GitHub
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester and GitHub
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
Jerry Wester
19428e2579
revert bag dumping changes
2022-12-13 19:15:07 -07:00
Jerry Wester
94bfa88ed9
add more platings
2022-12-13 19:14:43 -07:00
Jerry Wester