faaaay
da81f3facb
Merge branch 'master' into departmentalclothes
2021-07-29 20:29:35 +01:00
Dahlular
a2b74e5d91
Merge pull request #1389 from Support-Sergal/Merp
...
Micro Bricks IMPORT
2021-07-28 19:38:59 -06:00
Yipper Yapper
ab8b9f08c9
Import part two.
...
added alt click to rotate and added to cargo packs.
2021-07-28 20:27:34 -07:00
faaaay
50025c9ea7
Merge branch 'master' into departmentalclothes
2021-07-28 16:42:10 +01:00
Kabra_men
d17faa961e
Stargate map changes and additions + new mineral wall sprites
2021-07-24 20:39:01 -03:00
faaaay
3fb189cf54
Merge branch 'master' into departmentalclothes
2021-07-24 16:31:47 +01:00
QuoteFox
be0a6cf9f8
Merge pull request #1374 from ArchieBeepBoop/moltov
...
Reworks the D20 of fate's critical win roll + Removes 1 plushie
2021-07-22 14:45:59 +01:00
quotefox
ea41b22c7e
Whitelisting on jobs framework.
2021-07-22 14:41:29 +01:00
faaaay
0868b6d93d
Merge branch 'master' into departmentalclothes
2021-07-22 12:57:30 +01:00
ArchieBeepBoop
e926adcef3
Merge pull request #2 from Moltovz/Never-going-back-to-that-place-again
...
Reworks the D20 of fate's critical win roll
2021-07-22 05:19:23 -03:00
Archie
56fec5c4ba
Merge remote-tracking branch 'upstream/master' into bobross
2021-07-22 03:36:06 -03:00
Moltov
ce102e13ca
swaps wizard spawn for a healing staff on the D20 of fate
...
title
2021-07-20 21:36:56 -04:00
kevinz000
29cb1a0ae9
Ports the VV Refactor by Kevinz.
2021-07-20 17:09:43 -03:00
faaaay
7f0f7dfa32
Merge branch 'master' into departmentalclothes
2021-07-20 17:16:43 +01:00
quotefox
357749cd5f
Hyper butts
...
players can now have larger asses.
2021-07-20 11:59:33 +01:00
Archie
7ceffe217e
bonk
2021-07-20 05:03:54 -03:00
quotefox
ccad1678ea
New gential; Anus
...
Ass cheeks next. and works with fleshlights and vibrators.
2021-07-20 04:20:41 +01:00
Archie
b443f02b6d
Merge remote-tracking branch 'upstream/master' into bobross
2021-07-19 22:53:33 -03:00
QuoteFox
f914df3bc4
Merge pull request #1364 from Azarak/uuuuhhhh
...
Ports Long Range Gas Analyzer
2021-07-20 02:44:29 +01:00
QuoteFox
36884c6556
Merge pull request #1354 from ArchieBeepBoop/morecomponent
...
Chaplain Update - New Nullrods + Anti-Magic component update
2021-07-20 02:43:57 +01:00
QuoteFox
3a290ebd04
Merge pull request #1361 from EldritchBaguette/test
...
Fixes "medkit cabinent" typo
2021-07-20 02:43:35 +01:00
Azarak
fe39ee1533
Ranged analyser
2021-07-19 14:34:37 +02:00
Dimitri Bradley
52faecc81a
Fixes "medkit cabinent" typo
2021-07-17 00:33:29 -05:00
Dahlular
b01231fe6d
Boosts the price of the HEV suit crate
2021-07-15 18:52:19 -06:00
Archie
778f46ea00
Text
2021-07-15 18:49:14 -03:00
Archie
ccb77e1c46
Tildes
2021-07-15 18:42:59 -03:00
Archie
020ba1d77c
Eh
2021-07-15 18:34:43 -03:00
kevinz000
21c3b8e67b
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2021-07-15 17:56:19 -03:00
kevinz000
865ff4fa08
Merge pull request #9610 from Ghommie/Ghommie-cit273
...
ports anti-magic component code updates (holymelon sold separately).
2021-07-15 17:43:18 -03:00
Archie
8d33579e86
Removes holy melon anti-magic
2021-07-15 17:25:54 -03:00
faaaay
d1d8535256
Merge branch 'master' into departmentalclothes
2021-07-15 20:06:30 +01:00
Dahlular
59d06dc1f0
Merge pull request #1348 from ArchieBeepBoop/family
...
Removes voice of god prefbreak for something more... 'Family friendly'
2021-07-15 08:09:14 -06:00
Dahlular
81725f27c0
Merge pull request #1323 from ArchieBeepBoop/fuck512
...
Component Updates - Taking 512 compatibility out back and beating it with a stick
2021-07-15 08:08:03 -06:00
Archie
ac101ac67e
Removes voice of god prefbreak for something more... 'Family friendly'
2021-07-12 20:36:08 -03:00
Archie
7c5ef7c91d
typo fix
2021-07-09 22:45:59 -03:00
Dahlular
cba3ef40b4
Merge pull request #1338 from ArchieBeepBoop/something-about-the-insanity-trait-
...
Fixes a runtime with hallucinations and a thing about mindbreaker
2021-07-03 23:35:39 -06:00
Archie
24fec32815
OpFix
2021-07-04 02:30:34 -03:00
faaaay
85aee88860
Merge branch 'master' into departmentalclothes
2021-07-03 10:43:08 +01:00
Archie
b30220c48f
Fixes a runtime and mindbreaker
2021-06-29 23:25:08 -03:00
QuoteFox
814ed0e328
Merge pull request #1336 from RachelDoe/master
...
Prevent Portallights from being deepfried?
2021-06-28 09:05:14 +01:00
Archie
c26d02207a
Merge remote-tracking branch 'upstream/master' into fuck512
2021-06-28 03:32:04 -03:00
Dahlular
0e7f72f696
Merge pull request #1335 from ArchieBeepBoop/foodstuff
...
Restores Synthsteak / Synthmeat Functionality
2021-06-27 23:05:16 -06:00
Dahlular
24dee1eac6
Merge pull request #1334 from ArchieBeepBoop/copium
...
Copium Reagent
2021-06-27 23:04:53 -06:00
Dahlular
07e0116433
Merge pull request #1332 from ArchieBeepBoop/aistuff
...
AI camera stuff, runtime fixes, AI fixes, etc.
2021-06-27 23:00:43 -06:00
Dahlular
e4bd8d6ac5
Merge pull request #1331 from ArchieBeepBoop/cache2
...
Experimental - TG Asset Cache + Better Station Minimap
2021-06-27 22:58:59 -06:00
Dahlular
93be964948
Merge pull request #1313 from ArchieBeepBoop/suit
...
Corrects the color grading on the Inquisitor's Hardsuit
2021-06-27 22:56:38 -06:00
RachelDoe
49a15b027a
Prevent Portallights from being deepfried?
...
Tested and confirmed working. This edit will prevent portallights from being deepfried.
I will leave the decision to either merge or reject this PR to the admin looking into this. This literally took me like five minutes so don't feel bad if you need to kick this if its not aligning to the vision of the server.
2021-06-28 03:50:50 +02:00
Archie
6dd3456556
Fixes synthsteak
2021-06-27 17:07:46 -03:00
Archie
68431eb05a
Vent clog list too.
2021-06-27 16:23:03 -03:00
Archie
1547557166
Fixes shells unable to be re-used by the AI & an exploit
2021-06-27 14:09:40 -03:00
