shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,172 Commits 5 Branches 0 Tags
f8f278dfd58e6dfef752d3593ae474389fc429dd
Commit Graph

6172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
f8f278dfd5 Automatic changelog generation for PR #3093 [ci skip] 2017-10-03 19:16:12 -05:00
LetterJay
0830e6907e Merge pull request #3093 from Kevak/Shock-Collars 
Shock Collars Are Now A Thing.
 2017-10-03 20:16:10 -04:00
LetterJay
454fb160a8 Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188 
[MIRROR] Gives nightmares a random shadowling name
 2017-10-03 20:15:31 -04:00
LetterJay
d72f1c380a Merge pull request #3111 from Citadel-Station-13/upstream-merge-30998 
[MIRROR] Issues created with the report issue button will contain the round ID
 2017-10-03 20:15:11 -04:00
LetterJay
d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232 
[MIRROR] Fixes mech fab runtime
 2017-10-03 20:13:06 -04:00
LetterJay
3e975eca09 Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135 
[MIRROR] Adds a var to minds that makes them immune to conversion
 2017-10-03 20:12:43 -04:00
LetterJay
84d98d5973 Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208 
[MIRROR] Makes mobs on fire light up
 2017-10-03 20:12:24 -04:00
CitadelStationBot
b7473ec008 Automatic changelog generation for PR #3102 [ci skip] 2017-10-03 19:11:26 -05:00
LetterJay
b5e0981d62 Merge pull request #3102 from Citadel-Station-13/upstream-merge-31250 
[MIRROR] Greatly speeds up bees
 2017-10-03 20:11:25 -04:00
LetterJay
c522e7a6e8 Merge pull request #3101 from Citadel-Station-13/upstream-merge-31236 
[MIRROR] Monkey Cubes expanding will give the new monkey an attack log with their creator
 2017-10-03 20:11:13 -04:00
LetterJay
8fd4ca0fe4 Merge pull request #3100 from Citadel-Station-13/upstream-merge-31252 
[MIRROR] Partial revert of #30763 (datum config refactor)
 2017-10-03 20:10:56 -04:00
LetterJay
a3cea89134 Merge pull request #3099 from Citadel-Station-13/upstream-merge-31228 
[MIRROR] fixes healguardians not being able to heal people
 2017-10-03 20:10:42 -04:00
LetterJay
befcfd1f06 Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202 
[MIRROR] Organ initialization cleanup
 2017-10-03 20:10:08 -04:00
LetterJay
601ccec26f Merge pull request #3098 from Citadel-Station-13/upstream-merge-31253 
[MIRROR] Fixes morgue maintenance radstorm protection
 2017-10-03 19:49:37 -04:00
CitadelStationBot
e66e99776f Automatic changelog generation for PR #3096 [ci skip] 2017-10-03 18:49:24 -05:00
LetterJay
6e5322a722 Merge pull request #3096 from Citadel-Station-13/upstream-merge-31247 
[MIRROR] Fixes humans having no examine feedback for soft crit
 2017-10-03 19:49:22 -04:00
LetterJay
dc9b438bd8 Update skeletons.dm 2017-10-03 18:47:01 -05:00
LetterJay
e4d6219f1d Update brain_item.dm 2017-10-03 18:46:41 -05:00
CitadelStationBot
c32a37a86f Gives nightmares a random shadowling name 2017-10-03 18:41:38 -05:00
Armhulen
65a73bcefa Gives nightmares a random shadowling name (#31188) 
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
 2017-10-03 18:41:37 -05:00
CitadelStationBot
6b175cfc1c Issues created with the report issue button will contain the round ID 2017-10-03 18:28:17 -05:00
Jordan Brown
dc41460926 Issues created with the report issue button will contain the round ID (#30998) 
* Issues created with the report issue button will contain the round ID

* Update interface.dm

* More url encoding

* URL ENCODE THE PLANET!

* Server name

* Fix trevis

* Too many god damn fucking brackets here
 2017-10-03 18:28:17 -05:00
CitadelStationBot
b3d69ebe8e Fixes mech fab runtime 2017-10-03 18:19:40 -05:00
AnturK
67f0c2f41c Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-03 18:19:40 -05:00
CitadelStationBot
30957af0c0 Adds a var to minds that makes them immune to conversion 2017-10-03 18:15:20 -05:00
oranges
5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable 
Adds a var to minds that makes them immune to conversion
 2017-10-03 18:15:20 -05:00
CitadelStationBot
3610fa1b04 Makes mobs on fire light up 2017-10-03 18:14:10 -05:00
oranges
baa53ba1d3 Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA 
Makes mobs on fire light up
 2017-10-03 18:14:10 -05:00
CitadelStationBot
c053059b82 Greatly speeds up bees 2017-10-03 18:04:28 -05:00
vuonojenmustaturska
3310d73b7f Greatly speeds up bees (#31250) 
* Bee perf

* requested changes
 2017-10-03 18:04:28 -05:00
CitadelStationBot
1f6dedfb91 Monkey Cubes expanding will give the new monkey an attack log with their creator 2017-10-03 17:56:14 -05:00
ExcessiveUseOfCobblestone
126020185d Monkey Cubes expanding will give the new monkey an attack log with their creator (#31236) 
* Update snacks_meat.dm

* no one wants to see that

* WE'RE JUST SENDING IT TO ONE PLACE COBBY

* boop

* cool leoz tricks

* Update snacks_meat.dm
 2017-10-03 17:56:14 -05:00
CitadelStationBot
a68d44e151 Partial revert of #30763 (datum config refactor) 2017-10-03 17:55:05 -05:00
Jordan Brown
f1dfc1b6db Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss 
Partial revert of #30763 (datum config refactor)
 2017-10-03 17:55:05 -05:00
CitadelStationBot
41f1d56894 fixes healguardians not being able to heal people 2017-10-03 17:48:50 -05:00
kevinz000
21cfddd426 fixes healguardians not being able to heal people (#31228) 
* Update guardian.dm

* Update support.dm

* Update guardian.dm
 2017-10-03 17:48:50 -05:00
CitadelStationBot
34a03f048d Fixes morgue maintenance radstorm protection 2017-10-03 17:11:58 -05:00
ShizCalev
d98cd745dd Fixes morgue maintenance radstorm protection (#31253) 
* Morgue maint area

* Fixed typo
 2017-10-03 17:11:57 -05:00
CitadelStationBot
d6ed2ecd05 Fixes humans having no examine feedback for soft crit 2017-10-03 15:30:57 -05:00
KorPhaeron
159835db24 Fixes humans having no examine feedback for soft crit (#31247) 
* Soft crit examine

* Concise
 2017-10-03 15:30:57 -05:00
LetterJay
aec96bbbbe Merge pull request #2906 from deathride58/ashwalkerkinkmates 
Adds dildos to ashwalker ruin
 2017-10-03 15:23:07 -04:00
CitadelStationBot
49a354d752 Automatic changelog generation for PR #2922 [ci skip] 2017-10-03 14:22:46 -05:00
LetterJay
05f5ee73ce Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage 
Podpeople available as roundstart ft. minor stat changes
 2017-10-03 15:22:43 -04:00
AnturK
fd5acc5573 Organ initialization cleanup 2017-10-03 14:18:39 -05:00
Kevak
ba99e3845a Added normal collar functionality. 
You can now name your victim's collars on top of other functionality.
 2017-10-03 12:12:52 -07:00
CitadelStationBot
06fe1e8da6 Automatic changelog generation for PR #3092 [ci skip] 2017-10-03 11:32:21 -05:00
LetterJay
159924f42b Merge pull request #3092 from Citadel-Station-13/upstream-merge-31210 
[MIRROR] Silicons can no longer take brain damage
 2017-10-03 12:32:19 -04:00
LetterJay
0b7ef4d90f Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233 
[MIRROR] Fixes floating bullet holes
 2017-10-03 12:31:59 -04:00
LetterJay
4637fcb75c Merge pull request #3090 from Citadel-Station-13/upstream-merge-31231 
[MIRROR] Fixes alt-click runtime
 2017-10-03 12:30:37 -04:00
CitadelStationBot
ca61069ecb Automatic changelog generation for PR #3089 [ci skip] 2017-10-03 11:30:04 -05:00