Commit Graph

1326 Commits

Author SHA1 Message Date
kevinz000 7ab0b28c2c Merge pull request #8956 from CameronWoof/backpack-icons
Updates inventory plates
2019-07-29 05:02:34 -07:00
kevinz000 a95fff589c Merge pull request #8966 from Poojawa/RLD-fix
Gives RLD adaptive overlays, adds cable color to RCL sprites
2019-07-29 04:41:07 -07:00
kevinz000 c1092c0f48 Merge pull request #8974 from EgoSumStultus/blood-gun-sprite-fix
Fixes the blood chiller's inhand sprite
2019-07-29 04:39:39 -07:00
kevinz000 156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162
allows the captain sabre sheat to hold stunswords.
2019-07-29 04:37:21 -07:00
kevinz000 7b7f4f8042 Merge pull request #8795 from Sishen1542/emp-rebalance
Buffs tracking beacon EMPs, and makes EMP damage temporarily disable mech equipment
2019-07-29 04:32:51 -07:00
Ghommie a9e1fadcd4 allows the captain sabre sheat to hold stunswords. 2019-07-27 22:47:36 +02:00
BlackMajor b5ab3c1783 Merge pull request #8972 from Fractious/portTGNVG
Port TG new NVGs sprites
2019-07-28 01:55:06 +12:00
CameronWoof 8175f5d0a7 transparency pass 2019-07-26 02:21:43 -07:00
EgoSumStultus fe4459d0a0 fixes blood gun sprite 2019-07-26 01:12:59 -07:00
Fractious ba6c18c883 Port TG new NVGs
QOL porting these 3 new sprites for the Sec NVG, Med NVG and Diag NVG. Why not?
2019-07-25 22:00:25 -04:00
Sishen 68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen 612021b9d5 h 2019-07-25 21:43:02 -04:00
Poojawa b20d9ef21c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into RLD-fix 2019-07-25 04:57:18 -05:00
Poojawa 3dabf3c42f Fixes RLD overlays, adds cable color to RCL sprites 2019-07-25 04:50:40 -05:00
CameronWoof f7063e78d8 Updates inventory plates 2019-07-24 03:50:14 -07:00
kevinz000 0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
kevinz000 f114094138 Merge pull request #8926 from Thalpy/Secbats
Secbats
2019-07-22 20:15:36 -07:00
Ghommie fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
kevinz000 c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149
Towels.
2019-07-20 12:06:54 -07:00
kevinz000 08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000 f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries
Batch check injuries
2019-07-20 11:52:45 -07:00
Fermi 4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
kevinz000 b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
2019-07-17 00:50:21 -07:00
Carlen White 7c0cd0e40d Removes duplicate belts.dmi 2019-07-14 21:01:20 -04:00
kevinz000 2c41141d2f Merge pull request #8676 from Trilbyspaceclone/patch-176
Adds a Rapier for 8 Trilby cats
2019-07-14 14:46:44 -07:00
kevinz000 9de885da32 Merge pull request #8880 from CameronWoof/air-alarms-should-be-green
Makes Air Alarms Green
2019-07-14 14:20:54 -07:00
kevinz000 b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
kevinz000 735fc5fab6 Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
2019-07-14 03:35:33 -07:00
kevinz000 2259ea2e1c Merge pull request #8874 from Ghommie/Ghommie-cit132
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-14 03:33:37 -07:00
TrilbySpaceClone b2345b19ce critcal 2019-07-12 21:21:52 -04:00
CameronWoof d944c0bb27 Normalizes Air Alarms 2019-07-12 15:04:43 -07:00
kevinz000 280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
kevinz000 f2e67f2b9a Merge pull request #8870 from Ghommie/Ghommie-cit130
toning down many species' standard female chest.
2019-07-12 07:40:19 -07:00
kevinz000 57891813db Merge pull request #8847 from Ghommie/Ghommie-cit123
Porting in two bar signs.
2019-07-12 07:36:29 -07:00
kevinz000 e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122
Rubber toolboxes.
2019-07-12 07:35:25 -07:00
kevinz000 aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness
Makes combat boots look T A C T I C O O L
2019-07-12 07:33:36 -07:00
kevinz000 bb568d633b Merge pull request #8852 from Tupinambis/CursedPlush
Removes a plush representing the character of an underage player.
2019-07-12 07:32:29 -07:00
Ghommie d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
Ghommie b59c2837f6 "that's a penis" 2019-07-11 12:04:50 +02:00
Ghommie 517cfe227f toning down many species' standard female chest. 2019-07-11 11:43:13 +02:00
Ghommie 143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02:00
kevinz000 564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187
[Ready] Tweaks shields
2019-07-10 22:02:19 -07:00
TrilbySpaceClone 54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Ghommie ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Tupinambis 8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
Tupinambis 0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. 2019-07-08 22:23:16 -05:00
deathride58 d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
Ghommie 3ce1497ef2 Ports in two bar signs. 2019-07-08 17:02:08 +02:00
Ghommie 9043402483 Rubber toolboxes. 2019-07-08 14:34:14 +02:00