BongaTheProto
c67f726c3e
fym there's no cucumbers
2023-04-30 02:02:09 -05:00
BongaTheProto
d07dd792f5
heheheha
2023-04-29 15:03:23 -05:00
BongaTheProto
994f14c5d5
Merge pull request #520 from Pin-alternative/rework
...
Reworks to genitals
2023-04-23 14:47:32 -05:00
BongaTheProto
019ec841d6
Merge pull request #805 from CreepingRose/UltimateSpray
...
The Ultimate Spray Bottle
2023-04-08 20:08:59 -05:00
Pin-alternative
8dbbd69ae0
Merge remote-tracking branch 'upstream/master' into rework
2023-04-05 20:14:10 +10:00
CreepingRose
bdb6008f74
Adds the Ultimate Spray Bottle, a 750u bottle sprays 5 tiles away. Additionally makes the Bluespace Spray Bottle printable in the Service Techfab
2023-04-03 18:31:14 -04:00
Pin-alternative
54bb70438f
Merge remote-tracking branch 'upstream/master' into rework
2023-04-04 08:16:14 +10:00
Pin-alternative
a8dcfdfb13
hmmhm
2023-04-04 08:15:51 +10:00
BongaTheProto
1f58235a4a
Merge remote-tracking branch 'upstream/master'
2023-04-03 11:52:47 -05:00
SandPoot
9d214e2f9d
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-04-03 12:53:37 -03:00
BongaTheProto
815afcc45a
suits
...
all the suits from that file
2023-04-01 16:01:05 -05:00
Lin
654e5dad9d
Merge pull request #15864 from Putnam3145/auxmos-2
...
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
2023-04-01 00:17:22 -07:00
BongaTheProto
ffb387b096
Merge remote-tracking branch 'upstream/master'
2023-03-23 19:37:34 -05:00
BongaTheProto
d6306694ca
Merge pull request #766 from LeDrascol/quirk-hypno-expanded
...
New Cybernetic: Mesmer Eyes
2023-03-23 17:33:33 -05:00
SandPoot
32644fa56e
Merge pull request #317 from DeDrascol/production-restrictions-robotics
...
Add robotics production restrictions
2023-03-23 12:44:00 -03:00
Pin-alternative
c9457047aa
Merge remote-tracking branch 'upstream/master' into rework
2023-03-22 15:45:09 +11:00
BongaTheProto
b868a40f55
Merge pull request #680 from KathrinBailey/hugbox-sm
...
Modularises the SM delamination (Automating staff work via code)
2023-03-19 01:12:58 -05:00
BongaTheProto
1213be13b6
Merge remote-tracking branch 'upstream/master'
2023-03-13 21:42:07 -05:00
Darius
15d31031d9
Revert RnD console locks
...
This commit reverts the change causing R&D consoles to be locked by default upon creation, as it had unintended consequences.
2023-03-13 21:23:34 -04:00
Darius
31e6236ee5
Merge branch 'master' into quirk-hypno-expanded
2023-03-09 23:14:17 -05:00
BongaTheProto
09e336118f
Merge remote-tracking branch 'upstream/master'
2023-03-09 22:15:43 -05:00
Darius
05db5f8997
Add robotics production restrictions
...
This commit updates the production machinery restrictions to include mech fabricators. Old production check code has been updated for use with generic machines, and some checks have been moved.
2023-03-09 20:46:51 -05:00
Darius
f30815b889
Production topic restrictions rework
...
- Production access checks now use the `allowed` proc before attempting normal ID checks.
- Each successful return case now uses a unique DEFINE to allow future control over access types.
- Topic checks use a separate function
- Feedback messages have been moved out of the access check procs
2023-03-07 20:51:05 -05:00
Pin-alternative
1c1460ecd7
Merge remote-tracking branch 'upstream/master' into rework
2023-03-08 08:14:47 +11:00
Pin-alternative
6474cb5e6f
changes
2023-03-08 08:14:16 +11:00
BongaTheProto
db48587b4d
Merge pull request #752 from LeDrascol/vampire-overhaul-2
...
Bloodsucker Fledgling Overhaul: Part 2
2023-03-07 00:23:21 -05: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
Pin-alternative
d1b3acbc5c
Merge remote-tracking branch 'upstream/master' into rework
2023-03-05 19:16:26 +11:00
silicons
6efd3098d4
Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
...
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
BongaTheProto
62d42e7781
Merge pull request #760 from LeDrascol/refactor-code-emotes
...
Emote code refactor
2023-03-03 19:12:49 -05:00
BongaTheProto
227afc63c0
Merge pull request #776 from SPLURT-Station/moar-itemb
...
Some donator updates
2023-03-01 14:31:54 -05:00
SandPoot
6e55b682a7
touch ups, polychromic not working
2023-02-27 23:13:43 -03:00
BongaTheProto
c7c7bf6bdc
jestre
2023-02-26 21:11:27 -05:00
BongaTheProto
69ce6bc9bf
Merge branch 'master' into pr/680
2023-02-23 23:55:31 -05:00
Darius
8249f34be3
Merge branch 'master' into quirk-hypno-expanded
2023-02-23 00:43:09 -05:00
Darius
6737b2a1ce
Merge branch 'master' into vampire-overhaul-2
2023-02-23 00:40:22 -05:00
Darius
d48025140b
Merge branch 'master' into overhaul-quirk-dumb4cum
2023-02-23 00:37:04 -05:00
Comicao1
cd42fabf44
More
2023-02-22 20:24:43 -05:00
Comicao1
09a5fe16a2
Wendigo Fix
2023-02-22 20:23:38 -05:00
BongaTheProto
34e2df8b71
Merge pull request #772 from WoolyAypa/master
...
Snout & Wings (also one more stripper outfit)
2023-02-22 19:52:30 -05:00
BongaTheProto
2151624f10
Merge remote-tracking branch 'upstream/master'
2023-02-22 19:14:08 -05:00
WoolyAypa
eb926282f4
strippa
2023-02-22 20:50:56 -03:00
SandPoot
2bdec078d7
Merge pull request #311 from Sandstorm-Station/duct-piping
...
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot
c9055c4d65
minor issue
2023-02-21 16:34:10 -03:00
SandPoot
11a06b1686
pixelshift + layering
2023-02-21 14:27:10 -03:00
SandPoot
992d25ea08
Revert "pixelshift + layering"
...
This reverts commit 51818478c5
2023-02-21 14:25:29 -03:00
SandPoot
51818478c5
pixelshift + layering
2023-02-21 14:20:48 -03:00
BongaTheProto
4f44965172
Merge pull request #765 from SPLURT-Station/old-character-menu
...
Brings back the old character creation menu
2023-02-20 11:52:05 -05:00
BongaTheProto
5ec4443259
Merge remote-tracking branch 'upstream/master'
2023-02-20 11:36:04 -05:00
