shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,423 Commits 5 Branches 0 Tags
862acf2f06434ca6b6609da4eb4dbf4dc0a73bec
Commit Graph

11314 Commits

Author SHA1 Message Date
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471 
Ports some hud and update_icon code updates.
 2019-12-28 04:07:03 +00:00
Lin
80daaacc86 Merge pull request #10268 from Ghommie/Ghommie-cit487 
Effectively removes the old unused roboticist encryption key and headset.
 2019-12-28 00:08:24 +00:00
Ghom
13fc20c7c3 Merge pull request #10296 from Useroth/ghostcafe 
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
 2019-12-27 16:30:13 +01:00
Ghom
afd22cf618 Merge pull request #10298 from kappa-sama/patch-12 
nerfs chain smokers, removes stocks
 2019-12-27 13:37:38 +01:00
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Seris02
b4b6e550e4 Merge branch 'wintercoatsagain' of https://github.com/Seris02/Citadel-Station-13 into wintercoatsagain 2019-12-27 18:10:51 +08:00
Seris02
8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
kappa-sama
e97ca5f924 yeah fair enough 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-26 14:22:03 -05:00
Useroth
35846c452a Applied suggestions and minor tweaks. 2019-12-26 20:03:43 +01:00
Ghom
05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis 
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
 2019-12-26 16:11:54 +01:00
Ghom
12d0a2ee4c Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head 
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
 2019-12-26 16:07:45 +01:00
kappa-sama
4689d805a3 e 2019-12-26 02:54:38 -05:00
Lin
5670276c70 Merge pull request #10237 from Ghommie/Ghommie-cit479 
Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
 2019-12-25 19:06:46 +00:00
Lin
1931a2f715 Merge pull request #10242 from Ghommie/Ghommie-cit483 
Ports "Refactors can_see_reagents"
 2019-12-25 19:03:42 +00:00
Ghom
e7cf680ca7 Merge pull request #10266 from shellspeed1/master 
New insect marking customization option and three new wings.
 2019-12-25 03:43:29 +01:00
Seris02
85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02
9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +08:00
Hatterhat
d1c96237a6 the very shitty idea: "muh speedloader" 2019-12-24 04:16:33 -06:00
Hatterhat
681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
Lin
a0b90158c4 Merge pull request #10269 from Ghommie/Ghommie-cit488 
Fix goose meat.
 2019-12-24 00:56:07 +00:00
Ghom
37a6abd889 Merge pull request #10274 from kappa-sama/kappa-sama-patch-1 
no more 40% time dilation from broodmother
 2019-12-23 13:41:10 +01:00
Ghommie
187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Seris02
382c5d057a updates ratvar coat 2019-12-23 12:02:05 +08:00
Ghom
db2a108b4a Merge pull request #10246 from Citadel-Station-13/kevinz000-patch-129 
Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag
 2019-12-23 03:25:27 +01:00
Ghom
3635525c56 Merge pull request #10210 from Citadel-Station-13/kevinz000-patch-127 
Cargo shuttle now silently leaves behind slaughter demons + revenants
 2019-12-23 03:13:31 +01:00
Ghom
f3936f2c81 Merge pull request #10093 from Trilbyspaceclone/donut 
[Ready] Hey why dont I port that one donut pr? Ye just the one food related pr... Just the one... Oh no
 2019-12-23 02:31:50 +01:00
kevinz000
6157cb0042 Merge pull request #10254 from r4d6/patch-1 
Fix the nose boop
 2019-12-22 14:03:02 -08:00
kappa-sama
994cd753d5 no more 40% time dilation 2019-12-22 14:39:36 -05:00
Ghommie
757af250cf Fix goose meat. 2019-12-22 12:21:11 +01:00
Ghommie
4fbd9fdca0 Effectively removes the long unrequired roboticist encryption key. 2019-12-22 12:02:15 +01:00
kevinz000
f39d12527d Update supply.dm 2019-12-21 23:50:59 -08:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Seris02
d6727bce64 woops 2019-12-22 12:26:42 +08:00
Seris02
18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Trilbyspaceclone
f5a55aaecf Nerfs fun 2019-12-21 21:09:22 -05:00
Lin
37a0f0d7e6 Merge pull request #10241 from Ghommie/Ghommie-cit482 
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
 2019-12-21 22:44:09 +00:00
kevinz000
86074ae6b1 lowered to 10 after i struggled to open tickets panel 2019-12-21 14:33:02 -08:00
Ghom
6b2fe333f4 Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture 
Stun warfare rebalance - CBT edition
 2019-12-21 19:02:00 +01:00
Ghom
a33065a728 Merge pull request #10190 from Trilbyspaceclone/honeysoda 
The new buzz around the new soft drink
 2019-12-21 18:34:35 +01:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Ghom
2b2a3c2721 Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1 
Nerfs the Clockwork Marauder meta
 2019-12-21 17:26:04 +01:00
Ghom
2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123 
nanites can no longer spread through atmospherics-blocking objects
 2019-12-21 16:48:56 +01:00
Ghom
2a76743747 I'm playing dirty because we have too many PRs to merge anyway. 2019-12-21 16:42:27 +01:00
Ghom
5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? 2019-12-21 16:40:32 +01:00
Ghom
daf099388e Unnecessary OOC note. 2019-12-21 16:37:28 +01:00
Ghom
4624a1739a typo 2019-12-21 16:30:02 +01:00
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision 
Night vision trait but it just boosts barely-lit visibility
 2019-12-21 15:30:32 +01:00
Ghom
a384b1782b Merge pull request #10164 from kappa-sama/martialartist 
What ho, Muscle Wizard! Might you cast us a spell?
 2019-12-21 15:24:06 +01:00