Commit Graph

653 Commits

Author SHA1 Message Date
kevinz000 620af601b2 Merge pull request #9437 from JTGSZ/clothingrestrictions
Optional Species based clothing restrictions
2019-10-11 12:08:57 -07:00
kevinz000 d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223
No digitigrade plasmaman suits sprites for the time being, thank you.
2019-10-10 02:20:45 -07:00
kevinz000 fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
kevinz000 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
Ghommie c4a8b80851 No digitigrade plasmaman suits spriting, thank you. 2019-10-08 18:43:40 +02:00
JTGSZ 30a41292d8 left extra letter in comment 2019-10-07 18:02:16 -04:00
JTGSZ 7951d87022 species clothing restrictions
species clothing restrictions
2019-10-07 17:55:16 -04:00
Ghommie 99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
Ghommie 32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Fermi 4b6d996416 Merge branch 'master' into Blind-quirk-without-anger 2019-10-01 08:41:12 +01:00
kevinz000 250c6ed986 Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
Poojawa 9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
kevinz000 5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000 3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000 f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
Ghommie 300c572886 Added work boots and bananium clown shoes inhands, more fixes. ready. 2019-09-15 18:21:48 +02:00
Ghommie 89360c3574 Fixes clown shoes and work boots. 2019-09-15 17:56:20 +02:00
kevinz000 c4f5ce67b8 Merge pull request #9276 from Trilbyspaceclone/war_on_fashen
Adds clip on pokadoted pants, only in 4 types for now
2019-09-13 10:43:00 -07:00
TrilbySpaceClone 626e525d24 ..? 2019-09-12 23:36:59 -04:00
TrilbySpaceClone 6a36e5a317 huh 2019-09-12 23:26:07 -04:00
TrilbySpaceClone ef4b5c1b34 gone_reduced_to_atoms 2019-09-12 23:06:46 -04:00
Ghommie e987eb27b9 Adjusting a few dozen suits' body coverage. 2019-09-12 23:56:50 +02:00
TrilbySpaceClone fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
Trilbyspaceclone a751a73113 Apply suggestions from code review
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
2019-09-10 18:52:49 -04:00
TrilbySpaceClone 0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
Fermi 1e454ff1a7 Merge branch 'pr/25' into Blind-quirk-without-anger 2019-09-08 03:29:22 +01:00
Linzolle 64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
nik707 c826e1b412 Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
2019-08-31 02:06:33 -05:00
nik707 4f9b901a97 Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
Rebalances the MASONrig
2019-08-29 19:06:04 -05:00
nik707 9a0b6a21f9 Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
Amber alert ERTs no longer get pulse weapons
2019-08-28 13:05:56 -05:00
nik707 8e40e9d887 Merge pull request #9186 from Sishen1542/walklikeanegyptian
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
2019-08-28 00:02:39 -05:00
Ghommie 24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Sishen 3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
lolman360 c618ce114d Ebb 2019-08-22 14:18:49 +10:00
Sishen ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
kevinz000 86cb735cc9 Merge branch 'master' into kevinz000-patch-64 2019-08-18 23:41:40 -07:00
kevinz000 47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
2019-08-18 23:37:56 -07:00
kevinz000 3ef29bbbeb Merge pull request #9097 from lolman360/durathread
Adds durathread.
2019-08-18 23:37:07 -07:00
kevinz000 8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz
addition of the "assistant response team" a pack of assistants sent in from CComm
2019-08-18 23:34:49 -07:00
kevinz000 17a522300c Update hardsuit.dm 2019-08-18 20:05:42 -07:00
kevinz000 2c000636dd Update hardsuit.dm 2019-08-18 07:24:58 -07:00
TrilbySpaceClone 2b08b97f1d yay 2019-08-17 23:54:50 -04:00
TrilbySpaceClone e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
lolman360 e838da8039 Merge pull request #3 from Citadel-Station-13/master
3
2019-08-17 11:55:56 +10:00
kevinz000 cf55151f04 Merge pull request #9131 from jakeramsay007/Runtime-Fixes
Prevents runtime spam from Hugs of the North Star
2019-08-16 16:59:11 -07:00
Sishen 542915faa6 Update ert.dm 2019-08-16 10:53:24 -04:00
Sishen 26de2b8111 greybois 2019-08-16 10:49:26 -04:00
deathride58 5a4d0a73ce Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67
Fixes/tweaks jump boots
2019-08-14 15:00:36 -04:00
Chayse Ramsay 97c3b2eda7 Prevents runtime spam from Hugs of the North Star
Also fixes an unintended oversight of the Gloves of the North Star, with them causing the warcry upon picking up any item or clicking on any item in harm intent.
2019-08-14 18:29:35 +01:00
kevinz000 a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00