Commit Graph

30227 Commits

Author SHA1 Message Date
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
Kyep
67581476b5 axes return values from make_vampire 2018-11-18 18:51:28 -08:00
variableundefined
99bce0c778 Merge pull request #10252 from Kyep/evilfax_nom_nom_nom
Evilfax/Bless update
2018-11-19 10:46:27 +08:00
craftxbox
4d166e76d0 remove redundant checks 2018-11-18 22:34:20 -03:30
Kyep
018519044f deletes unathi breacher 2018-11-18 16:56:29 -08:00
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
datlo
0e11043dc7 changed addtimers to SEND_SOUND 2018-11-18 16:03:57 +00: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
datlo
ad77078982 add wizard delayed alarm 2018-11-17 16:08:38 +00:00
datlo
4766a86ccb Ports TG antag alert sounds 2018-11-17 14:20:37 +00:00
Kyep
b49772ec59 deletes assassin, lynch 2018-11-16 23:15:34 -08:00
alex-gh
45435169f5 Fixes anonymous syndicate borg radio. 2018-11-17 08:11:43 +01: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
Kyep
fcf0b382e6 apparently, cigars are popular 2018-11-16 22:36:37 -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
variableundefined
2f26dc1d11 Merge pull request #10242 from Certhic/radiochannels
refactor radio magic numbers
2018-11-16 23:51:53 +08:00
Certhic
e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
variableundefined
3ae6856d61 Merge pull request #8684 from Aurorablade/Arntyougoingtosayhello
Adds FloorCluwnes so you can float too
2018-11-16 19:28:02 +08:00
Gwydion Brain
f3eaed5606 woop woop woop 2018-11-15 19:18:50 -08:00
variableundefined
f27ccc0808 Merge pull request #10238 from Kyep/cryotool_update
Admin SSD tool update
2018-11-16 11:03:13 +08:00
variableundefined
e447578281 Merge pull request #10237 from Mitchs98/hoodiefix
Hoodie Fixes - No longer removable Hoods/Sprite fixes.
2018-11-16 09:46:20 +08:00
variableundefined
c12b2130ef Merge pull request #10236 from Kyep/admin_ban_checks
Fixes admin ban button failing in rare situations
2018-11-16 09:44:17 +08:00
variableundefined
5332962ad9 Merge pull request #10195 from farie82/borg-perma-stun
Borgs now can't get perma stunned by slings or goliaths and what not
2018-11-16 08:48:12 +08:00
variableundefined
2761a43580 Merge pull request #10225 from AzuleUtama/xRayFalloff
X-ray laser nerf - Falloff and Charge
2018-11-16 08:35:10 +08:00
variableundefined
ec5a42c9f9 Merge pull request #10235 from tigercat2000/asset_cache_speeeeeeeeeeeeeeeed
Asset Cache speed (tgstation/tgstation#35003 + more)
2018-11-16 08:33:17 +08:00
Mitchell
bd3a3e37c7 Fixes Hoodies 2018-11-15 18:26:43 -06:00
Kyep
36856839d3 v1 2018-11-15 14:53:45 -08:00
tigercat2000
9fb54c4c82 Asset Cache speed (tgstation/tgstation#35003 + more) 2018-11-15 12:18:00 -08:00
tigercat2000
9e51b56cbd NTSL2 fixes (ParadiseSS13/Paradise#10232) 2018-11-15 11:03:16 -08:00
joep van der velden
54f033ac75 ehhhhh 2018-11-15 14:06:22 +01:00
joep van der velden
888e26b22c better fix. Just call it when it's needed 2018-11-15 13:33:31 +01:00
variableundefined
d34841ca63 Merge pull request #9138 from tigercat2000/NTSL2
NTSL2
2018-11-15 17:58:27 +08:00
AzuleUtama
0c59000df1 made stamina dropoff check actually work - cleaned up code
Based on reviewer's comments.
2018-11-15 09:06:19 +00:00
alex-gh
d9383577f3 Fixes the passive effects of prayer beads and prayer bread. 2018-11-15 09:40:09 +01:00
Aurorablade
deb7c90f3d possible eating bug fix
i more then likely reversed my logic
2018-11-15 02:51:49 -05:00
variableundefined
f5f43253ff Merge pull request #10213 from Dave-TH/internal_bleeding
Internal Bleeding Rework
2018-11-15 10:40:41 +08:00
AzuleUtama
44035a5af8 Fix for shuttle curse item
Fixed an exploit that allows cultists to use a shuttle curse more than twice by either being very fast or having multiple cultists use orbs at the same time.
2018-11-15 01:12:42 +00:00
AzuleUtama
b790261d8d Quick change to tile_dropoff if statement should there be no dropoff 2018-11-14 22:10:56 +00:00
AzuleUtama
e2c81535f0 X-ray laser nerf - Falloff and Charge
See here for the main reasoning behind the PR -
https://nanotrasen.se/forum/topic/14790-wanted-unwanted-features-refactors-bugfixes-thread/
2018-11-14 21:12:52 +00:00
alex-gh
a96475e2c6 Fixes infinite roller beds for borgs. 2018-11-14 06:23:08 +01:00
Kyep
3c9b63e875 mark obj targets, despawn_occupant 2018-11-13 20:44:21 -08:00
KasparoVy
bf5f894b9d Corrects Datum Name for Consistency 2018-11-13 22:55:25 -05:00