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 and ZomgPonies
bf3d3cf04a
Use absolute paths
2014-08-16 21:44:27 -04:00
GinjaNinja32 and ZomgPonies
52b0de9928
Use \the macro
2014-08-16 21:44:10 -04:00
GinjaNinja32 and ZomgPonies
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 and ZomgPonies
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
Bone White
d882485376
T-Ray scanner var improvement
...
Allows tray scanner range and pulse duration to be controlled by vars.
Added three upgraded tray scanners, with increased range, increased
pulse duration, and both of these features.
2014-08-16 08:46:48 +01:00
ZomgPonies
6c25320a71
Merge pull request #378 from Bone-White/master
...
New icon for pipe freezer
2014-08-11 21:09:41 -04:00
Bone White
69122ab55e
New icon for pipe freezer
...
icon by pancakeflipper
2014-08-12 02:04:07 +01:00
ZomgPonies
e08fb5d1d0
Merge pull request #377 from Bone-White/master
...
Further atmos changes
2014-08-11 20:38:52 -04:00
Bone White
ea1feb41dd
Further atmos changes
...
mixers and filters no longer have density = 1, so mobs can walk over
them.
new item: pipe freezer, can temporarily freeze pipes to allow
unwrenching when over the threshold internal pressure
note: has a temporary skin of hand labeler, needs a new sprite really.
2014-08-11 17:45:18 +01:00
Artorp
d0447f061a
Fixes states of onedirectional windows
...
Will only change the reinforced plasma window. You don't have to pry
them out of a frame before anchoring them anymore.
2014-08-11 01:51:10 +02:00
Artorp
048f5235c9
Plasma construction and full window fixes
...
- Fixed plasma window construction
- Fixed full windows from stopping players and gasses from moving above
them even with density set to 1
2014-08-11 01:06:27 +02:00
alex-gh
808e908dc6
Merge pull request #365 from Artorp/chemisty-changes
...
Chemisty quality-of-life changes
2014-08-09 22:34:54 +02:00
Artorp
5a22e5e8dd
Station Blueprints fix
...
Fixes the station blueprints.
2014-08-09 09:24:02 +02: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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
3eae360963
Handcuffs now require an aggressive grab
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
2014-08-03 16:07:35 -04:00
mwerezak and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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
Zuhayr and ZomgPonies
c0ba021bcd
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
...
Conflicts:
code/datums/supplypacks.dm
code/game/machinery/hydroponics.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/spray.dm
maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
ZomgPonies
03f116b8a4
Compile fix
2014-07-26 11:34:50 -04:00
DJSnapshot and ZomgPonies
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
ZomgPonies
bf19e7ac73
PDA investigate fix
2014-07-25 13:52:57 -04:00
ZomgPonies
dc56dc8958
Investigate PDA messages
2014-07-25 12:32:35 -04:00
ZomgPonies
b33df4745c
Removed deprecated power generation stuff (AM, RUST) to free up more procs
2014-07-25 11:33:37 -04:00
Zuhayr and ZomgPonies
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
ZomgPonies
8fc1cc3024
Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly.
2014-07-24 16:35:22 -04:00
ZomgPonies
6b0cee85b0
Spearbug
2014-07-23 15:50:33 -04:00
ZomgPonies
dc38069dd4
Merge pull request #319 from Bone-White/master
...
Added secrets - bomb log for more explosives
2014-07-23 14:45:25 -04:00
Bone White
d355956062
Added secrets - bomb log for more explosives
...
Chem grenades, ghetto grenades and standard grenades added. All log on
priming but not explosion.
2014-07-23 19:02:47 +01:00
ZomgPonies
f2ecd1503b
Completed adding Kidan Ambassador decorations
2014-07-23 13:24:51 -04:00
Rob Nelson and ZomgPonies
ee5d2c8a1c
Trash autoignition
...
Conflicts:
code/game/objects/items/trash.dm
2014-07-20 10:59:44 -04:00
Whitellama and ZomgPonies
c231899b05
Eating with utensils now produces the eating sound, fixed #5687
2014-07-20 05:56:06 -04:00
Walter0o and ZomgPonies
08c5cdb736
should fix #5618 , trivial kitchen utensil bug
2014-07-18 06:58:47 -04:00
Rob Nelson and ZomgPonies
f7b516a5ab
Shit catches on fire now
...
Conflicts:
code/ZAS/Fire.dm
code/game/objects/items/weapons/storage/bible.dm
code/game/objects/items/weapons/storage/boxes.dm
code/modules/mob/living/living_defines.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photography.dm
code/setup.dm
2014-07-18 06:32:15 -04:00
VampyrBytes
34712ecc37
Fix for internal organ surgery
...
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
2014-07-16 20:17:50 +01:00
mwerezak and ZomgPonies
a07b7a5ce3
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
Conflicts:
code/defines/obj.dm
code/game/machinery/kitchen/smartfridge.dm
code/game/machinery/vending.dm
code/game/mecha/equipment/weapons/weapons.dm
code/modules/games/cards.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living_defense.dm
2014-07-16 09:53:34 -04:00
Neerti and ZomgPonies
dd6f54ed47
fun fact: This took 6 hours because bay uses different say().
...
fun fact: I'm never porting say-related stuff from bay.
Conflicts:
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/radio/headset.dm
code/modules/mob/living/say.dm
code/modules/mob/living/silicon/ai/ai.dm
2014-07-16 09:27:12 -04:00
ZomgPonies
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
ZomgPonies
88098da3c7
Object verb removal crew
2014-07-15 08:47:43 -04:00
Mark Aherne and ZomgPonies
9b45dbabfb
Continued work in progress on a major revision of the NanoUI templating system.
...
Conflicts:
code/ATMOSPHERICS/components/omni_devices/filter.dm
code/ATMOSPHERICS/components/omni_devices/mixer.dm
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/game/machinery/kitchen/smartfridge.dm
code/modules/nano/nanoexternal.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/power/apc.dm
code/modules/power/smes.dm
code/modules/reagents/Chemistry-Machinery.dm
nano/css/shared.css
nano/js/nano_update.js
nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
VampyrBytes