bf11aa68dc
fix
2020-09-25 11:00:36 -03:00
fc4c7c3bc0
Revert "Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2""
...
This reverts commit de57597599
2020-09-25 13:30:25 +01:00
54d7544659
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
2020-09-25 13:24:26 +01:00
022b4bce7b
Merge pull request #501 from quotefox/revert-494-hunter
...
Revert "Cursed Blood Trait"
2020-09-25 06:24:20 -06:00
de57597599
Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2"
...
This reverts commit 2bb89753e999065c9f92
2020-09-25 13:24:14 +01:00
a6648fa822
Revert "Cursed Blood Trait"
2020-09-25 06:23:51 -06:00
2bb89753e9
Merge pull request #500 from Jay-Sparrow/Dynamic2
...
Dynamic2
2020-09-25 13:13:58 +01:00
99065c9f92
Merge pull request #494 from ArchieBeepBoop/hunter
...
Cursed Blood Trait
2020-09-25 06:11:24 -06:00
c24a47171c
Merge pull request #499 from VladinXXV/style
...
Fixes exactly 2560 rouge pixels on galaxy suits
2020-09-25 06:09:26 -06:00
9a4b83b9b7
Merge pull request #497 from ArchieBeepBoop/lavahermit
...
Some changes to lavaland hermit
2020-09-25 06:09:04 -06:00
ec03b6846d
Merge pull request #496 from ArchieBeepBoop/soilfix
...
Digging Soil Patches returns construction amount
2020-09-25 06:08:05 -06:00
ad4f7fd313
Merge pull request #495 from CapnMachaddish/box-and-pubby-cremator-access-change
...
Changes the Cremator buttons on Box and Pubby to require Cremator Access
2020-09-25 06:07:28 -06:00
29fe614523
Merge pull request #482 from ArchieBeepBoop/ruinspawn
...
Changes Oldstation, Free Golem, Syndie Comms placement weight and cost
2020-09-25 06:06:06 -06:00
767241ad39
Merge pull request #498 from Chemlight/RubberSec
...
Round start Warden shotgun
2020-09-25 06:05:24 -06:00
8d91beaeec
Small tweak
...
wheeeeee
2020-09-25 00:22:00 -05:00
bb8e2a91bd
Dynamic Mode for reals
...
Here we go.
2020-09-24 23:54:21 -05:00
eb3be911ba
STOP YOU HAVE BROKEN THE LAW
...
Removes illegal shoulder pads known to cause people to want to have sex with you from galaxy suits
2020-09-25 00:53:43 -04:00
33e5ad2dec
Revert "Dynamic Mode"
...
Gotta remove some config files
2020-09-24 23:52:51 -05:00
ed9590c1d9
Dynamic Mode
...
And I thought synths were hard
2020-09-24 23:44:14 -05:00
6ad704e532
Round start Warden shotgun
...
"Due to unfortunate events with mishandling equipment in the security departments, we have exchanged the mutinition found in the compact shotgun found in the warden's locker due to a 'workplace hazard',"
2020-09-24 21:23:41 -07:00
bc7f843e27
hermit
2020-09-25 00:58:44 -03:00
046a8ffd5a
Soil returns construction amount
2020-09-25 00:32:40 -03:00
6971fef3a7
Update BoxStation.dmm
...
Slight fuckup corrected
2020-09-24 17:29:47 -05:00
f6caa0626c
Changes the Cremator buttons on Box and Pubby to require Cremator Access to use.
...
Exactly what it says in the title. Also adds two pointless and very very minor easter eggs.
2020-09-24 16:47:09 -05:00
67b9e33eeb
damage
2020-09-24 17:30:52 -03:00
dfbd97add6
Merge pull request #492 from Chemlight/Botany-seeds-to-xenoarch
...
Pink and Milk Seeds to Xenoarch
2020-09-24 13:59:22 -06:00
f48a70f1c9
less prob because it was spammy af
2020-09-24 16:42:01 -03:00
fe85e4afea
commit
2020-09-24 16:36:27 -03:00
4d1f86a78e
WITH THE LEMON
...
finally throw combustible into xeno arch, giving a decent amount on the table,
2020-09-24 10:58:02 -07:00
e13cb1e65f
Consume Kudzu
...
Additionally threw in Kudzu at the last minute.
2020-09-24 09:49:23 -07:00
2c4b0b130f
Seeds to Xenoarch
...
More funny seeds found in fossils.
2020-09-24 09:44:48 -07:00
a76de77577
Merge pull request #493 from Chemlight/Lewd-crate-pills
...
Updating a cargo crate
2020-09-24 09:40:38 -06:00
ee0f8ce2a0
Updating a cargo crate
...
Provided an extra item to the lewd crate contraband being a bottle of breast enlargment.
2020-09-24 06:12:50 -07:00
f24e6abb34
Pink and Milk Seeds to Xenoarch
...
This little change is simply removing Pink peppers and Milk Melons away from the unstable mutagen list and instead putting it on the xenoarch artifact being a possible item to discover, compared to drowning a watermelon or pepper in chemicals.
2020-09-24 05:41:02 -07:00
324dd8327d
Merge pull request #487 from ArchieBeepBoop/runtimefixes
...
Let's play the game of experimental runtime fixes.
2020-09-24 11:25:54 +01:00
45e5375fbd
Merge pull request #491 from MalricB/lifeisacageanddeathisthekey
...
Ports ++bold++ __underline__ and ||italics|| from Citadel
2020-09-24 11:24:19 +01:00
960372f6ea
lmao
...
penis music
2020-09-23 23:28:48 -03:00
cfa6e536c8
Merge pull request #489 from Chemlight/Lightweight-Trait
...
Lightweight trait
2020-09-23 19:23:26 -06:00
f8119538c5
Merge pull request #488 from ArchieBeepBoop/narnar
...
NarNar Shuttle Fix 2.0
2020-09-23 19:22:17 -06:00
b61129069d
Merge pull request #486 from ToonClyde/Syndicate-Defib
...
A defib for Dahl
2020-09-23 19:21:08 -06:00
decfb768e2
Lightweight trait
...
A lightweight trait that was ported from skyrats, gives you twice the drunk power from drinks, watch what you down with each swig!
2020-09-23 00:11:54 -07:00
910f36577c
fix access and plating
2020-09-22 18:37:33 -03:00
72c8e681e3
runtimev1-experimental
2020-09-22 16:37:51 -03:00
77e88027ba
Missing wires and areas
2020-09-22 12:24:42 -07:00
9445c0ef3e
A defib for Dahl
2020-09-21 19:01:46 -07:00
ebb5e5b1c4
Merge pull request #485 from Dahlular/funnyjar
...
Fixes Stepping Text and Rebalances Some Things
2020-09-21 09:35:57 -06:00
6aa49fd730
Scaling pickup timer
2020-09-21 09:26:18 -06:00
cec839a100
Fix stepping text, updates health values
2020-09-21 07:21:51 -06:00
fca47941d5
Merge pull request #484 from ArchieBeepBoop/eldritchaff
...
Eldritch Affairs Port
2020-09-21 06:10:04 -06:00
cb087e3df3
Merge pull request #483 from ArchieBeepBoop/narnar
...
Narnar Shuttle (Shuttle 667) Fix
2020-09-21 05:41:19 -06:00
Dip