Commit Graph

18707 Commits

Author SHA1 Message Date
Kyep
90ff882149 use Ansari snipped and SEND_SOUND macro 2018-11-22 18:34:13 -08:00
Kyep
3fe6c8b019 switch to tg method, override /mob/dead/forceMove, revert all previous component changes 2018-11-22 18:26:36 -08:00
variableundefined
b2ce6e5829 Merge pull request #10300 from AlAtEX/IPC-repair
Adds a Medkit for IPCs
2018-11-22 11:53:11 +08:00
variableundefined
33c4c3385a Merge pull request #10308 from AzuleUtama/laserTagGuns
Made laser tag guns work again
2018-11-22 10:01:31 +08:00
AzuleUtama
0332e946f6 Made laser tag guns work again
dear god what have i done
2018-11-22 01:25:16 +00:00
variableundefined
214cf7b12e Merge pull request #10288 from datlo/basicsofCQC
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
datlo
12f6413417 SPACING SKREEE 2018-11-22 00:27:52 +00:00
variableundefined
4a01a631f4 Merge pull request #10297 from Kyep/adm_fixes
Adds Hellhound, minor outfit tweaks
2018-11-22 08:24:18 +08:00
variableundefined
d0f6c0f5b3 Merge pull request #10294 from Eniraz/helmet-toggle-button
Hardsuit helmet toggling button
2018-11-22 08:22:21 +08:00
AlAtEx
e6740168d9 Added machine first aid kit code 2018-11-21 18:14:40 -05:00
datlo
5ef666f0f5 oops forgot to remove a line
durrr
2018-11-21 17:27:29 +00:00
datlo
f1ada4fefa big commit changes in desc
Added missing spacings
Added attack logging
Raised cost to 9 TC, made it tator and nukies, added to surplus, allowed
nukies to have gloves of north star, and updated description
Added a check preventing usage of CQC with gloves of north star
Fix a bug where attacks would not go through if a combo was done but the
target was critically injured (regular attacks now done instead)
Changed disarm logic, now always hits for 5 damage and use regular
disarm logic for disarming/pushing
Replaced "Big Bossed" attack verb by "neck chopped" and "gut punched"
because nofunallowed
2018-11-21 17:18:32 +00:00
Eschess
86c229b6e0 changes loc for forcemove, also removes pointless blockhair flag 2018-11-21 16:29:10 +01:00
Michael C
f542396d11 Update drinks.dm 2018-11-20 21:05:41 -05:00
Fox McCloud
fca03ff254 Merge pull request #10032 from variableundefined/SqueakComponent
Add in squeak component & refactor bikehorn, mouse to use it.
2018-11-20 18:38:42 -05:00
Kyep
39b6725555 hellhound + minor tweaks 2018-11-20 15:19:19 -08:00
variableundefined
5e380d9c03 Merge pull request #10292 from AzuleUtama/chameleonSuitFixes
Fix for chameleon suit allowing you to pick an undefined object
2018-11-21 06:54:47 +08:00
Eschess
aba20b9b58 typecasts link_sui and readds helmet autodeploy 2018-11-20 23:26:51 +01:00
Eschess
1f614665f3 toggling combat mode via the helmet button actually works now 2018-11-20 19:38:53 +01:00
AzuleUtama
221f1a3833 Spacing
spacing
2018-11-20 16:20:31 +00:00
AzuleUtama
d667df47eb Fix for chameleon suit allowing you to pick an undefined object
Stop chameleon suit allowing you to choose a undefined suit with a placeholder texture, as well as making the first option in the list a random color for each individual suit.
2018-11-20 15:19:54 +00:00
datlo
e0037ffefe space activated
mama mia stop the copy pasta
2018-11-20 15:03:38 +00:00
variableundefined
6f96aa0a5c Merge pull request #10280 from TDSSS/silencer-tech
Moved silencers, gave them their own folder + tech origin
2018-11-20 19:19:02 +08:00
datlo
65286d7830 Adds the CQC manual to nukie uplinks 2018-11-20 03:51:52 +00:00
Eschess
5c57cf38b0 adds proc, still WIP 2018-11-20 01:36:43 +01:00
Eschess
c306b94a37 trying to fix the combat mode thingy WIP 2018-11-19 20:17:27 +01:00
variableundefined
db6a9b1d3a Merge pull request #10270 from Citinited/remove-accessories-using-altclick
Alt-clicking a jumpsuit removes accessories from it
2018-11-19 22:44:50 +08:00
TDSSS
92991726ec Moved silencers, gave them their own folder 2018-11-19 09:52:25 +01:00
B.A.L
4102faf1d6 Refunds and text warning 2018-11-18 22:34:54 -07:00
variableundefined
4fb0652741 Merge pull request #10263 from Quantum-M/damnCarp
Vampires and Changelings are no longer able to use sleeping carp.
2018-11-19 13:06:35 +08:00
variableundefined
3f060e034e Merge pull request #10253 from Kyep/cc_contraband
CC/Admin Outfits Update
2018-11-19 11:05:12 +08:00
variableundefined
1b7384c950 Merge pull request #10275 from craftxbox/10250
make sure they arent dead when trying to use hud stuff
2018-11-19 10:51:49 +08:00
craftxbox
4d166e76d0 remove redundant checks 2018-11-18 22:34:20 -03:30
Kyep
1c8542414d ancient vampire raise vampires/shapeshift 2018-11-18 16:54:26 -08:00
craftxbox
a1e42aa7ff make sure they arent dead when trying to use hud stuff 2018-11-18 13:08:10 -03:30
Citinited
16f5ad5d87 Alt-clicking a jumpsuit removes accessories from it 2018-11-18 14:37:22 +00:00
B.A.L
00c8f5bd07 Item restriction and uplink description 2018-11-17 21:47:45 -07:00
Eschess
899ce0db8b Update hardsuit.dm 2018-11-18 02:48:16 +01:00
Kyep
de0840ff5e adds shamebrero smite 2018-11-17 17:36:55 -08:00
Kyep
b7c613f76c gives NTUO centcom access, fixes typo in access.dm, adds mindshield to specops arm implant 2018-11-17 17:28:31 -08:00
Eschess
16a514a2a8 adds ui button to toggle hardsuit helmet 2018-11-17 23:17:56 +01:00
Kyep
b49772ec59 deletes assassin, lynch 2018-11-16 23:15:34 -08:00
Kyep
c58691934e fixes merge conflict with floorcluwne/admin topic.dm 2018-11-16 23:08:09 -08:00
Kyep
3a3fb9503a fixes cold nolog, noclone to cluwne 2018-11-16 23:04:49 -08:00
variableundefined
ef3a2ce9c5 Adds in missing stub signals 2018-11-17 09:26:13 +08:00
Aurorablade
e9109552b2 Added a forgotten return 2018-11-16 19:05:20 -05:00
Kyep
ec5503a2d5 no more soup 2018-11-16 09:59:04 -08:00
Kyep
d0a64445eb soup flasks 2018-11-16 09:34:57 -08:00
Kyep
070c349a81 fixes merge conflict in boxes.dm 2018-11-16 09:00:30 -08:00
Kyep
2063795224 revert/fix jacket, CC pinpointer, re-add dark lord, greytide toolbox 2018-11-16 08:47:45 -08:00