Commit Graph

14703 Commits

Author SHA1 Message Date
Ghommie
969aaad3d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-07-24 17:35:29 +02:00
kevinz000
0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
Lasse Andersen
aac71758b7 Cloning console board memory
Makes the cloning console circuit board have local memory of the records of the console.
2019-07-23 14:25:03 +02:00
Michiyamenotehifunana
2845cb2e7d Resprites RCDs and RPDs 2019-07-23 20:23:45 +08:00
Trilbyspaceclone
359d0e8531 Update lungs.dm 2019-07-23 01:27:03 -04:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
kevinz000
f114094138 Merge pull request #8926 from Thalpy/Secbats
Secbats
2019-07-22 20:15:36 -07:00
BurgerLUA
1195727617 snowflake-b-gone 2019-07-22 16:18:43 -07:00
Chayse Ramsay
1c8768afe4 Redundant Redundancies made Redundant 2019-07-22 19:31:42 +01:00
Chayse Ramsay
ede61d8cb2 Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded. 2019-07-22 00:55:41 +01:00
Ghommie
57d5ddb80f removed extra broken bottle strength. 2019-07-21 12:20:10 +02:00
Ghommie
c06c1d9b60 typo. 2019-07-21 12:11:18 +02:00
Ghommie
ce4e86279c Further improvements. 2019-07-21 11:58:58 +02:00
kevinz000
f8fdbfc211 Update quirks.dm 2019-07-21 02:30:19 -07:00
Ghommie
5504fb6a6a Alt click examine string. 2019-07-21 11:27:26 +02:00
Ghommie
2f46b68e11 switching to non combat mode attack_self() and AltClick(), less clunky. 2019-07-21 11:22:19 +02:00
Ghommie
e8584720b3 Fixes suit worn overlay for towels. 2019-07-21 11:18:38 +02:00
Ghommie
1a47fedade More intuitive, way less weird edge cases. 2019-07-21 10:26:16 +02:00
Ghommie
3440757fd0 Glass. 2019-07-21 10:01:00 +02:00
Ghommie
fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
BurgerLua
60beff3420 Added 2019-07-20 17:42:00 -07:00
Fermi
4f2406ee3a Made it a critterbox instead. 2019-07-20 20:55:46 +01:00
Fermi
c2b3df34c1 Cargobox. 2019-07-20 20:46:50 +01:00
Fermi
309bc1c899 Requested change. 2019-07-20 20:34:44 +01:00
Ghom
85f87b6679 Update code/game/objects/items/melee/energy.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-07-20 21:26:18 +02:00
kevinz000
c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149
Towels.
2019-07-20 12:06:54 -07:00
kevinz000
66ddaf3ae8 Merge pull request #8903 from Trilbyspaceclone/patch-192
Re-words brass flasks to not be wrong
2019-07-20 11:59:30 -07:00
kevinz000
ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -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
3176cf958f Merge pull request #8917 from deathride58/fuckwarpwhistles
Fixes warp whistles
2019-07-20 11:54:48 -07:00
kevinz000
f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries
Batch check injuries
2019-07-20 11:52:45 -07:00
kevinz000
8c93e48a01 Merge pull request #8896 from Bapldap/patch-1
Updates Blood Brother
2019-07-20 11:51:54 -07:00
kevinz000
3fada5c624 Merge pull request #8922 from BurgerLUA/Voting-Transparency
Gamemode Voting Results are now displayed at the end of round screen
2019-07-20 11:50:21 -07:00
kevinz000
08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix
Makes the autolathe shock wire actually shock you
2019-07-20 11:49:39 -07:00
TrilbySpaceClone
0a8954c2d6 Update packs.dm 2019-07-19 23:53:12 -04:00
TrilbySpaceClone
d981b756e3 Update packs.dm 2019-07-19 23:49:53 -04:00
kevinz000
94f5573e3a Update nanites.dm 2019-07-19 17:45:44 -07:00
Fermi
e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi
75d6768ba7 Changed how the box works so it's not a storage. 2019-07-19 22:12:05 +01:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
12f2b767ab removes stamina-free spammability. 2019-07-19 21:23:07 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Fermi
4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
BurgerLua
b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07:00
Fermi
fbf542134a Cidadel makes me want to hurt myself. 2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01:00
BurgerLua
9d183beb9c Added 2019-07-17 18:15:55 -07:00
Ghommie
44063e523d missing flag. 2019-07-18 02:14:00 +02:00
kevinz000
fd1eecc996 Update click.dm 2019-07-17 15:26:15 -07:00