Commit Graph

651 Commits

Author SHA1 Message Date
Dahlular
cbcbcb7835 Revert "Revert "Exosuit Fix"" 2020-07-31 10:32:07 -06:00
Dahlular
a4b894f349 Revert "Exosuit Fix" 2020-07-31 10:04:33 -06:00
JaySparrow
72acb45cba Exosuit Fix
Decreases accidental nudity.
2020-07-30 22:35:34 -05:00
Dahlular
7d2c3e8581 Merge pull request #354 from quotefox/lagimprovements
Lag cleaning.
2020-07-30 11:55:55 -06:00
QuoteFox
6aa1279408 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-07-30 18:37:43 +01:00
QuoteFox
b4c01f4d25 Breast Fix Naga
Fixes breasts for the NAGA hot fix.
2020-07-30 18:37:28 +01:00
Dahlular
5b933cb277 Merge pull request #352 from Oposshim/Poss-Fix-v1
poss tweak
2020-07-30 08:23:23 -06:00
Dahlular
1e833ff6ff Merge pull request #351 from jjpark-kb/posialertsystem
adds the positronic alert system
2020-07-30 08:15:51 -06:00
QuoteFox
6c10835cbd Merge pull request #353 from jjpark-kb/sciencedoorsactuallysciencedoors
changes the cyan to purple for research doors
2020-07-29 23:59:19 +01:00
QuoteFox
b1d82e4ff5 Lag cleaning.
Ports and Improvements to help attack lag.
2020-07-29 23:54:40 +01:00
Dahlular
e47f620e89 holy shit shut up tatyana 2020-07-29 08:31:55 -06:00
jjpark-kb
29f32eedd6 changes the cyan to purple for research doors 2020-07-28 19:37:40 -04:00
Oposshim
23fca2d314 poss tweak
a new character creation background (Hirophant tiles)/ I forgot the sec cap Ns/ the NT MREs in maints/ I decided that the medical + is fuck ugly/ sneaked a system shock 2 reference in the toys with the rest of the SS13 sci fi stuff/ more NT i forgot with cargo bounties/ basically more surface level fixes
2020-07-28 19:24:45 -04:00
jjpark-kb
08ba88559f adds the positronic alert system 2020-07-28 18:42:23 -04:00
Chemlight
e7adf4df86 Brushed off salt
Changed 20 seconds to 15.
2020-07-27 18:53:46 -07:00
Chemlight
f1d59db927 Sonic Jack Hammer Nerf
This change is to modify the sonic jackhammer intereacting with reinforced walls from a previous 5 seconds to a now total of 20 seconds
2020-07-27 13:36:48 -07:00
QuoteFox
9a1b29e23f Addes a admin spawn apron to the kinkmate
Addes a admin spawn apron to the kinkmate
2020-07-26 23:54:42 +01:00
jjpark-kb
026f5d8129 adds back moth eating 2020-07-20 14:11:41 -04:00
Dahlular
fe7344f320 Merge pull request #344 from Jay-Sparrow/Size-code
Size code overhaul
2020-07-20 00:52:30 -06:00
JaySparrow
14cdc61f43 size code fixes
fuckin soze coode fuck. Like, stepping buffs. Stepping nerfs. Speed stuff. My brain hurts. Here is code yum yum.
2020-07-20 01:03:15 -05:00
Dahlular
af3bdb6728 Merge pull request #339 from Jay-Sparrow/archeaology
Xeno Die of Fate, and plushies
2020-07-18 21:54:55 -06:00
JaySparrow
2a87252114 Synthliz toxin
It was pointed out that this was missing. Here ya go.
2020-07-18 18:53:03 -05:00
JaySparrow
a37cf0bb0f Xeno Die of Fate
Boy, this one got out of hand fast.
2020-07-18 13:28:21 -05:00
Dahlular
a93bb8422f Increases Body Size Pref Upper Limit (Last one) 2020-07-18 04:38:43 -06:00
jjpark-kb
4d5caddf84 Merge remote-tracking branch 'hyper/master' into splitxenoarch 2020-07-18 03:36:45 -04:00
jjpark-kb
3d40cca968 no more storms on lower zlevel 2020-07-18 03:35:18 -04:00
jjpark-kb
f96913be1f Fixed xenobotany, ill do the storm later 2020-07-18 02:41:03 -04:00
Dahlular
5a6a1ecd46 Merge pull request #333 from Jay-Sparrow/cloning
Cloning fix
2020-07-17 19:39:51 -06:00
Dahlular
9ee66ce9a8 Merge pull request #335 from Jay-Sparrow/antags
Nerf rate of kill objectives
2020-07-17 19:38:54 -06:00
JaySparrow
36e314a2d1 Nerf rate of kill objectives
Less murder
2020-07-17 20:24:01 -05:00
Jay-Sparrow
b6c4bc088b Merge branch 'master' into cloning 2020-07-17 19:42:19 -05:00
jjpark-kb
bc43bb59cd Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:40:53 -04:00
Dahlular
cf6fbfbd18 Merge pull request #332 from jjpark-kb/youneedradialsson
porting some radials
2020-07-17 18:22:34 -06:00
jjpark-kb
542ceb7996 Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:07:33 -04:00
Dahlular
281082329f Merge pull request #330 from jjpark-kb/okaysothereareproblems
small amount of fixes
2020-07-17 18:04:55 -06:00
Dahlular
23220db465 Merge pull request #324 from jjpark-kb/addvscodeplease
Adds VSCODE stuff
2020-07-17 17:18:43 -06:00
JaySparrow
e5592937aa Cloning fix
Clone pod works more than once, and resizes characters
2020-07-17 17:14:01 -05:00
jjpark-kb
d1e22462ad lots of radial stuff 2020-07-17 17:58:30 -04:00
JaySparrow
af4bf42d01 Revert "Revert "DNC weirdness""
This reverts commit c8d666cd34.
2020-07-17 16:26:37 -05:00
JaySparrow
546f3a993c Revert "Revert "Do Not Clone""
This reverts commit 05acfc1f72.
2020-07-17 16:26:32 -05:00
jjpark-kb
24e989cb34 there, I got chasms to work now 2020-07-17 04:17:38 -04:00
jjpark-kb
b94acd3962 xenoarch yes 2020-07-17 03:46:44 -04:00
JaySparrow
05acfc1f72 Revert "Do Not Clone"
This reverts commit 3c572f0d6e.
2020-07-17 00:22:23 -05:00
JaySparrow
c8d666cd34 Revert "DNC weirdness"
This reverts commit 49ac30a0b4.
2020-07-17 00:21:59 -05:00
jjpark-kb
89409ee834 adding xenoarch 2020-07-16 23:33:06 -04:00
jjpark-kb
6ce26a163f okay, here are some changes 2020-07-16 22:27:26 -04:00
Dahlular
fc127651b1 Merge pull request #322 from Chemlight/Uniform-Armor-Update
Uniform armor changes
2020-07-16 02:28:21 -06:00
Dahlular
23becf948c Merge pull request #327 from Jay-Sparrow/Size-code
Health and speed relative to size
2020-07-16 02:27:43 -06:00
JaySparrow
36257c0d9a SIZE CODE
3 AM, WOOO. MAYBE IT WORKS NOW.
2020-07-16 03:05:10 -05:00
Dahlular
756aa7b2af Merge pull request #321 from Jay-Sparrow/Husk-Fix
Husks and donuts
2020-07-15 22:17:07 -06:00