Commit Graph

20989 Commits

Author SHA1 Message Date
kevinz000 7875ca73be Merge pull request #8444 from dtfe3/patch-1
CWC player requirement increase
2019-06-08 01:03:37 -07:00
CitadelStationBot 2e18e963fe Automatic changelog generation for PR #8432 [ci skip] 2019-06-08 03:03:03 -05:00
kevinz000 68ef76e09a Merge pull request #8432 from Ghommie/Ghommie-cit15
Buffs stunprods to not have a cooldown
2019-06-08 01:03:01 -07:00
CitadelStationBot 89d1d74d9d Automatic changelog generation for PR #8442 [ci skip] 2019-06-08 03:02:23 -05:00
kevinz000 c7f346a03c Merge pull request #8442 from Trilbyspaceclone/patch-139
Makes soviet clothing no longer need to be hacked AND emaged
2019-06-08 01:02:21 -07:00
kevinz000 31d77ef58e Merge pull request #8403 from Ghommie/Ghommie-cit12
Updating the .github folder guidelines.
2019-06-08 01:01:20 -07:00
CitadelStationBot ef3c0cba63 Automatic changelog generation for PR #8391 [ci skip] 2019-06-08 03:00:43 -05:00
kevinz000 8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
2019-06-08 01:00:41 -07:00
CitadelStationBot 87023134e0 Automatic changelog generation for PR #8538 [ci skip] 2019-06-08 00:37:31 -05:00
deathride58 1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail
Hair - Long Twintails
2019-06-08 01:37:29 -04:00
deathride58 3051994c0e Merge pull request #8546 from Sishen1542/Plushies
Crew Plushies! Redtail, Annie, Paxton, Mason.
2019-06-08 01:10:25 -04:00
deathride58 7fcb46e0f6 Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41
buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s
2019-06-08 01:09:52 -04:00
deathride58 8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
2019-06-08 01:07:56 -04:00
CitadelStationBot 6ff01f39f3 Automatic changelog generation for PR #8236 [ci skip] 2019-06-07 11:46:02 -05:00
kevinz000 32c27be2b6 Merge pull request #8236 from deathride58/fuckatmos
[EXPERIMENTAL] Unomos - Listmos except gas mixtures only use one single list for gasses instead of 2 per gas + 1
2019-06-07 09:45:59 -07:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Sishen b9b219d561 adds redtail 2019-06-06 16:01:40 -04:00
CitadelStationBot 17febdd07c Automatic changelog generation for PR #8534 [ci skip] 2019-06-06 08:53:01 -05:00
kevinz000 31a942a63a Merge pull request #8534 from dtfe3/dtfe3-pink-panties
Pink Panties
2019-06-06 06:52:57 -07:00
Sishen b7b2fbc843 Update plushes.dmi 2019-06-06 05:24:27 -04:00
Sishen eccfb8cc15 Update plushes.dmi 2019-06-06 05:22:41 -04:00
Sishen cf3002a392 slimeplush 2019-06-06 05:14:01 -04:00
dtfe 8d74a341ba Update human_face.dmi 2019-06-06 08:38:20 +02:00
dtfe3 dbac1e135a Update human_face.dmi 2019-06-05 21:08:10 +02:00
CitadelStationBot b9aebf69b1 Automatic changelog generation for PR #8525 [ci skip] 2019-06-05 13:35:25 -05:00
kevinz000 7decce3808 Merge pull request #8525 from Trilbyspaceclone/patch-161
Makes cookies loved by all
2019-06-05 11:35:22 -07:00
CitadelStationBot 3eb217b063 Automatic changelog generation for PR #8430 [ci skip] 2019-06-05 13:31:14 -05:00
kevinz000 0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea
Adds improvised 7.62 rifle
2019-06-05 11:31:10 -07:00
kevinz000 6e4a3c71f9 Merge pull request #8532 from Poojawa/WHYBYOND
Without this, everyone is broken
2019-06-05 11:30:09 -07:00
dtfe3 3de6e2d71a twintails...
title
2019-06-05 19:41:23 +02:00
dtfe3 d761a78a7f Merge pull request #7 from dtfe3/revert-6-dtfe3-pink-panties
Revert "test"
2019-06-05 19:30:04 +02:00
dtfe3 d1d0f38460 Revert "test" 2019-06-05 19:29:53 +02:00
CitadelStationBot 057107da3b Automatic changelog generation for PR #8424 [ci skip] 2019-06-05 11:54:39 -05:00
deathride58 98304e4975 Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port
Ctrl Alt Click on pipes, port from TG
2019-06-05 12:54:36 -04:00
dtfe3 b4bcc97aa2 Merge pull request #6 from dtfe3/dtfe3-pink-panties
test
2019-06-05 16:22:37 +02:00
dtfe3 2e47c973c6 Pink Panties 2019-06-05 16:15:38 +02:00
dtfe3 064e52e3de Delete underwear.dmi 2019-06-05 16:04:27 +02:00
dtfe3 71c7dd0dba Delete underwear.dm 2019-06-05 16:04:19 +02:00
dtfe3 a8f2af3899 Merge pull request #5 from dtfe3/dtfe3-pinkpanties
pink panties!
2019-06-05 15:59:21 +02:00
Poojawa 27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
dtfe3 6c6df79e19 pink panties!
Yes I sprited some pink panties because apparently that wasn't a thing. Who knows why.
2019-06-05 15:01:50 +02:00
CitadelStationBot d44aa44ec6 Automatic changelog generation for PR #8528 [ci skip] 2019-06-05 04:02:43 -05:00
kevinz000 2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries
Fixes prosthetic invisible hands, improves female markings
2019-06-05 02:02:40 -07:00
kevinz000 4dcef2b618 Merge pull request #8472 from Sishen1542/Crewmonitors
Boxstation Crew Monitor
2019-06-05 01:59:19 -07:00
CitadelStationBot ecef40258b Automatic changelog generation for PR #8387 [ci skip] 2019-06-05 03:55:21 -05:00
kevinz000 980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
CitadelStationBot 962afa97bc Automatic changelog generation for PR #8516 [ci skip] 2019-06-05 03:53:37 -05:00
kevinz000 cc2d3a7f10 Merge pull request #8516 from Ghommie/Ghommie-cit26
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
2019-06-05 01:53:34 -07:00
CitadelStationBot 055396d110 Automatic changelog generation for PR #8491 [ci skip] 2019-06-05 03:52:19 -05:00
kevinz000 89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24
zero, , null, and empty text strings, all fulfill the ! operator.
2019-06-05 01:52:17 -07:00