Markolie
dd3739119e
Properly document harmbatonning removal, window update check
2014-11-20 00:55:26 +01:00
Markolie
8f47f50009
Fix stun batons and holographic sign projectors
2014-11-19 20:20:10 +01:00
Markolie
59edf2701d
Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders
2014-11-18 20:36:40 +01:00
Markolie
3e67587869
Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles
2014-11-18 17:31:43 +01:00
Markolie
2f7d3ae26d
Additional constructable and upgradeable machines, adds soap to drones, updates teleporter
2014-11-18 03:13:12 +01:00
Markolie
876a5067a0
Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes
2014-11-17 08:32:39 +01:00
Fox-McCloud
f84ca26012
Fixes and Stuff
2014-11-11 22:48:08 -05:00
Fox-McCloud
a1a71006c0
Oops
2014-11-10 03:21:31 -05:00
Fox-McCloud
111b24ceb8
Janitor Rework
2014-11-10 03:17:56 -05:00
SamCroswell
46793a2c04
Poker table fix, two handed fix, Nukeops naming
...
- Poker tables now actually use the poker table icon. I don't reccomend
you use this, as the poker table icon doesn't mesh well as of right now.
Plan to fix that at a later date.
- Items that require two hands now properly update when
wielded/unweilded. Hooray.
- Minor changes to the way nukeops naming works.
2014-11-09 21:37:14 -05:00
Fox-McCloud
37b1113ce6
Merge pull request #483 from SamCroswell/master
...
ESword Changes
2014-11-08 21:38:00 -05:00
SamCroswell
211023bd67
Syndicate Medibots, Energy Recharge Fix
...
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.
- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
SamCroswell
28c15dcc26
ESword Changes
...
- All weapons now have a 'no_embed' var. If this var is set to 1 (It is
0 by default) the item will bypass checks to embed into people during
melee combat and when thrown. This is intended to be used for items such
as the esword, where it is physically impossible for it to be embedded
into someone, as opposed to something like the telebaton, where it's
simply improbably that would get embedded into anyone.
- All energy-based melee weapons have no_embed set to 1.
- All energy-based melee weapons now have a more appropriate hitsound
when active. See: blade1.ogg
2014-11-08 14:12:11 -05:00
Fox-McCloud
bf867da403
Merge pull request #469 from Nienhaus/master
...
Adds EngiCart
2014-11-08 10:58:25 -05:00
Fox-McCloud
bf93e9caaf
Jetpacks for Sydnies!
2014-11-08 01:15:46 -05:00
Nienhaus
25a92c91fd
Ports the TG style Jani Cart.
2014-11-07 22:48:44 -06:00
DZD
489bff2983
Rolling Paper Icon Fix
...
Fixes icon_state of individual sheets of rolling paper so they actually
show a sprite.
2014-11-07 16:09:50 -05:00
Fox-McCloud
e1c83d7f55
Nuke-Ops-Final
2014-11-06 07:29:16 -05:00
Fox-McCloud
dd200af4bf
Nuke Ops Rework Phase 2
2014-11-05 06:56:46 -05:00
Fox-McCloud
650c9a3e3c
Nuke Ops Rework Phase 1
2014-11-03 23:45:00 -05:00
Fox-McCloud
f77eb5c914
Traitor Gear and Balance
2014-10-28 01:35:03 -04:00
Fox-McCloud
e0059bbf46
Implant Fix
2014-10-25 22:47:09 -04:00
Fox-McCloud
097cc95bd2
R&D Nerfs
2014-10-25 20:54:25 -04:00
Bone White
4419dc7243
Handcuff grab-requirement reversion
...
As requested by Fox
2014-10-18 18:05:10 +01:00
Fox-McCloud
8c1f6431e6
Tweaks and Fixes and Major Map Changed
...
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
Fox-McCloud
9c8326e120
Fix, Tweak, and Revise
...
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
2014-09-29 02:10:28 -04:00
melandor0
7ff72c38cd
nanotrasen.se
...
Replaces 80.244.78.90 with nanotrasen.se in the code.
2014-09-04 19:45:43 +02:00
melandor0
59f73acfd3
Traitorstation Fixes + SyndieCat
...
Fixes some things with traitorstation and adds SyndieCat.
2014-09-02 13:53:11 +02:00
ZomgPonies
f4b6450a20
Merge pull request #398 from VampyrBytes/master
...
IPC and nuke disk fixes
2014-08-20 03:07:01 -04:00
VampyrBytes
5b8253fb57
IPC and nuke disk fixes
...
Fix for IPC revival
Prevents nuke disk from being inserted via cavity surgery
2014-08-19 07:06:12 +01:00
ZomgPonies
ed484b68aa
Compile fix
2014-08-16 21:45:36 -04:00
GinjaNinja32
bf3d3cf04a
Use absolute paths
2014-08-16 21:44:27 -04:00
GinjaNinja32
52b0de9928
Use \the macro
2014-08-16 21:44:10 -04:00
GinjaNinja32
0427641d89
Moved all shard code to one file. Fixed #5992
...
Conflicts:
code/defines/obj/weapon.dm
code/game/objects/items/stacks/sheets/glass.dm
2014-08-16 21:43:38 -04:00
Ccomp5950
3ca02d3c5b
Fixed the font tag on mouse traps description.
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
2014-08-16 20:53:29 -04:00
Artorp
4c59644d95
Enable medical belt quick pickup
...
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
2014-08-09 02:51:15 +02:00
ZomgPonies
509af0b236
Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun
2014-08-04 01:54:27 -04:00
mwerezak
c22ea7a5c0
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 16:15:47 -04:00
mwerezak
2c7926eff8
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 16:09:38 -04:00
mwerezak
3eae360963
Handcuffs now require an aggressive grab
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
2014-08-03 16:07:35 -04:00
mwerezak
279718728f
Allows the use of stun weapons to show up in autopsies
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:00:48 -04:00
mwerezak
f43a3ead70
Merges taser and stun baton effects
...
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/living.dm
2014-08-03 15:59:21 -04:00
mwerezak
64638987dc
Adds siemens_coefficient handling to stun batons
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:54:34 -04:00
ZomgPonies
f2f1b53791
Meh
2014-08-03 15:48:09 -04:00
mwerezak
ac0e3966d6
Taser cleanup and fixes
...
Fixes cloaking devices and deadman switches being included in taser code
somehow.
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 15:47:21 -04:00
ZomgPonies
fef301062e
Boop
2014-08-03 15:42:27 -04:00
mwerezak
0dc07bafa1
Stun baton nerf
...
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
Conflicts:
code/_onclick/item_attack.dm
code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:40:19 -04:00
Rob Nelson
7832e1c26f
PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN
...
Conflicts:
.gitignore
baystation12.dme
code/_onclick/hud/screen_objects.dm
code/modules/clothing/spacesuits/alien.dm
code/modules/media/tapedeck.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/species.dm
html/changelog.html
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/in-hand/in-hand_sync_report.txt
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/tank.dmi
2014-07-31 18:58:49 -04:00
ZomgPonies
03f116b8a4
Compile fix
2014-07-26 11:34:50 -04:00
DJSnapshot
b61a4d837f
fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work)
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
2014-07-26 11:31:40 -04:00
