Commit Graph

591 Commits

Author SHA1 Message Date
QuoteFox 1d5cf4bde1 Part 1 - Respawning every 30mins.
Allow people to respawn (return to the menu) every 30mins after death, or ghost.

To do- option to user ban respawns, and stop respawns on certain antags/roles.
2020-09-25 15:51:49 +01:00
QuoteFox fc4c7c3bc0 Revert "Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2""
This reverts commit de57597599.
2020-09-25 13:30:25 +01:00
QuoteFox 54d7544659 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-09-25 13:24:26 +01:00
QuoteFox de57597599 Revert "Merge pull request #500 from Jay-Sparrow/Dynamic2"
This reverts commit 2bb89753e9, reversing
changes made to 99065c9f92.
2020-09-25 13:24:14 +01:00
Dahlular a6648fa822 Revert "Cursed Blood Trait" 2020-09-25 06:23:51 -06:00
QuoteFox 2bb89753e9 Merge pull request #500 from Jay-Sparrow/Dynamic2
Dynamic2
2020-09-25 13:13:58 +01:00
Dahlular 99065c9f92 Merge pull request #494 from ArchieBeepBoop/hunter
Cursed Blood Trait
2020-09-25 06:11:24 -06:00
Dahlular ec03b6846d Merge pull request #496 from ArchieBeepBoop/soilfix
Digging Soil Patches returns construction amount
2020-09-25 06:08:05 -06:00
Dahlular 767241ad39 Merge pull request #498 from Chemlight/RubberSec
Round start Warden shotgun
2020-09-25 06:05:24 -06:00
JaySparrow bb8e2a91bd Dynamic Mode for reals
Here we go.
2020-09-24 23:54:21 -05:00
JaySparrow 33e5ad2dec Revert "Dynamic Mode"
Gotta remove some config files
2020-09-24 23:52:51 -05:00
JaySparrow ed9590c1d9 Dynamic Mode
And I thought synths were hard
2020-09-24 23:44:14 -05:00
Chemlight 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
Dip 046a8ffd5a Soil returns construction amount 2020-09-25 00:32:40 -03:00
Dip 67b9e33eeb damage 2020-09-24 17:30:52 -03:00
Dahlular 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
Dip f48a70f1c9 less prob because it was spammy af 2020-09-24 16:42:01 -03:00
Dip fe85e4afea commit 2020-09-24 16:36:27 -03:00
Chemlight 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
Chemlight e13cb1e65f Consume Kudzu
Additionally threw in Kudzu at the last minute.
2020-09-24 09:49:23 -07:00
Chemlight 2c4b0b130f Seeds to Xenoarch
More funny seeds found in fossils.
2020-09-24 09:44:48 -07:00
Chemlight 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
Chemlight 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
QuoteFox 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
CygnusB 960372f6ea lmao
penis music
2020-09-23 23:28:48 -03:00
Dahlular cfa6e536c8 Merge pull request #489 from Chemlight/Lightweight-Trait
Lightweight trait
2020-09-23 19:23:26 -06:00
Chemlight 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
Dip 72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip 88393855ae category 2020-09-21 03:19:54 -03:00
Dip f54f6d4841 A fix for the clockcult scripture unlocks 2020-09-21 02:00:59 -03:00
Dip 9aa6a44267 Eldritch Affairs Port 2020-09-20 20:26:15 -03:00
Dip 2bbe88a238 WE'LL DO IT LIVE 2020-09-19 16:33:48 -03:00
Dip 14b98107c4 properly comment something that had been disabled 2020-09-19 13:30:39 -03:00
Dahlular 13cb100637 Merge pull request #470 from ArchieBeepBoop/dilation
Time Dilation
2020-09-19 10:20:44 -06:00
Dahlular eaf431537d Merge pull request #475 from ArchieBeepBoop/godwhy
CEASE THE DUPLICATES PLEASE GOD WHY
2020-09-19 10:17:22 -06:00
Dahlular 52ce5cfaca Merge pull request #466 from ArchieBeepBoop/carp
Carp Team Random Event
2020-09-19 10:09:01 -06:00
Dip 4a255a107e adminbus change 2020-09-19 13:07:58 -03:00
Dahlular faf578d691 Merge pull request #476 from ArchieBeepBoop/radglow
Ports TG #51879 - Rads Glow, Goggles Buff
2020-09-19 09:21:02 -06:00
Dahlular b465c27a7e Merge pull request #474 from ArchieBeepBoop/maso
Choke Slut Trait
2020-09-19 09:18:30 -06:00
Dip 0a9ffc234a SON THIS IS RAD 2020-09-19 03:07:17 -03:00
Dip 8e8bfad471 CEEEEEEEEEEEEEEEASE 2020-09-19 00:12:55 -03:00
Dip d316dcb9f3 Choke Slut Trait 2020-09-18 23:02:45 -03:00
Dahlular 75bea20d94 Merge pull request #471 from ArchieBeepBoop/ghostrolecustom
Fixes mirror shitcode ™️
2020-09-18 10:17:06 -06:00
Dip 7165bc1892 Assign body size + extras 2020-09-18 13:07:51 -03:00
SmeagleDeagle 23c7caf6d3 a 2020-09-18 02:40:43 -07:00
Dip ebdce3d52d bringing back a simpler version of time dilation 2020-09-17 16:12:41 -03:00
Dip 7568fd27a3 Balance changes 2020-09-16 19:13:43 -03:00
Dip 6c3b83bcb3 Carp Team Random Event 2020-09-16 16:37:59 -03:00
Dip 7fb89c0a54 Custom Ghost Role Appearance 2020-09-16 01:02:36 -03:00
Dahlular 6be7a731f1 Some fixes + Neuters Growth Serum 2020-09-14 03:06:44 -06:00