2cf4b90ba8
Give refill canisters three separate charge values for standard, contraband(hacked) and premium(coin) items.
...
So that next time someone increases the amount of items in a vending machine w/o updating the refill charges (looking at you /vending/clothing), it will affect the items in the same product list instead of only contraband.
I also updated the charges of the refill canisters to the correct amounts.
I removed the chef food section of the snack vending machine, nobody has ever used it.
2015-07-22 22:06:04 +02:00
d0eb72fd3a
#whoa #wow
2015-07-22 14:58:58 -04:00
8e00cdfe9a
Fixed storage not updating when joining cable coils.
...
Fixed stack objects not updating storage when deleted.
Added handle_atom_del proc to be called on destroy.
Label comment for handle_atom_del()
2015-07-22 17:58:05 +01:00
47706cf88b
Merge pull request #10717 from Ikarrus/thisisafix
...
Fixes Reset and Purge having "This is a bug." law on examine
2015-07-21 16:12:43 -03:00
40967044cb
Merge pull request #10707 from KorPhaeron/fixes
...
Fixes
2015-07-21 20:46:27 +02:00
d1dec3ffec
Changed on phil's comments
2015-07-21 12:20:15 -05:00
452313a5fa
Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
...
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
e6a8511ac1
Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire
2015-07-21 05:50:02 -07:00
5f6cf57e07
Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire
2015-07-21 05:32:08 -07:00
d2616d52fc
Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
...
Conflicts:
code/game/atoms.dm
code/game/atoms_movable.dm
2015-07-20 22:41:45 +02:00
76feff5dfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix
...
Conflicts:
code/game/objects/structures/watercloset.dm
code/modules/clothing/head/helmet.dm
code/modules/mob/living/carbon/carbon.dm
2015-07-20 22:37:06 +02:00
bc5eac33a8
Needs a check here to let reset and purge be used.
2015-07-20 09:02:46 -06:00
99c5d75cef
Adds check for firer being null
2015-07-20 06:07:17 -05:00
ec3677da2d
Fixes Reset and Purge having "This is a bug." law on examine
...
No reason to have this string as far as I can tell.
2015-07-19 23:20:04 -06:00
2833f59f5f
A typo and a forgotten thing to do.
2015-07-19 22:16:09 +02:00
94d072828f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
...
Conflicts:
code/game/atoms_movable.dm
code/game/objects/items/weapons/dice.dm
code/game/objects/weapons.dm
code/modules/flufftext/Hallucination.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/living_defines.dm
code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
b9f67a8334
Merge pull request #10668 from phil235/CyborgFlashFix
...
Fixes drone and cyborg not being affected by mounted flashers.
2015-07-20 11:53:03 -05:00
1c05fbcf6a
Merge pull request #10450 from phil235/MechRefactoring
...
Mech code refactor
2015-07-20 02:00:11 -05:00
9eced1ac5b
Fixes thrown closet opening to not use spawn().
...
Fixes throw_at() to look nicely for xeno leap by adding the diagonals_first argument.
Removes useless gateway/Crossed and gateway/Bumped().
Changes throw_at() to use diagonal directions.
I replaced the atom variable "throwpass" with the LETPASSTHROW pass_flags
I readded hit_check proc to catch things getting on the thrown thing's tile during its sleep(1) (especially needed for mobs running towards the thing), the only other possibility would've been to add throwing checks in atom/movable/Crossed() (called after every move) and I don't think it'd be worth it.
I added the item var "thrownby" to be able to continue to log the thrower of the item when it hits a mob. It removes the need for a thrower argument in throw_impact() and hitby().
2015-07-19 21:29:35 +02:00
001dd150e0
Merge pull request #10655 from MMMiracles/TWANG
...
Adds a 'TWANG' sound effect for guitars
2015-07-19 13:34:40 -04:00
a2f338cabf
Merge pull request #10343 from GunHog/Borgie_Lights
...
[Review] Cyborg headlamps!
2015-07-19 19:26:09 +02:00
0f244730bc
Merge pull request #10626 from Ikarrus/lizardmov
...
AI Module Updates
2015-07-19 18:06:06 +02:00
65f56e146d
Liberty Station fix, alien whispering fix, plasma statue logging.
...
Fixes the liberty station spawning an SMG without a firing pin by
creating an unrestricted variant of it. Added unrestricted L6 and
unrestricted bulldog object types for admin spawn since I was already
there.
Fixes aliens being able to whisper to ghosts.
Adds logging to shooting plasma statues.
2015-07-19 10:31:52 -05:00
bf83ef4c53
Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag
...
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
2015-07-19 04:12:30 -07:00
f4407871ab
Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights
...
Conflicts:
code/game/gamemodes/shadowling/shadowling_abilities.dm
2015-07-18 21:56:25 -05:00
f4dd5604d6
Commit
2015-07-18 19:39:33 +08:00
57b05f5a18
Merge pull request #10493 from phil235/SmokeFoamBuff
...
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
2015-07-18 03:45:38 +01:00
a4a7c21744
Merge pull request #10653 from phil235/Fixarino
...
Three simple fixes again
2015-07-17 15:49:41 -05:00
41890b2845
Merge pull request #10637 from phil235/ShowerBurnFix
...
Shower Fix
2015-07-17 15:34:29 -05:00
e2d76a0116
Fixes drone and cyborg not being affected by mounted flashers.
...
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
2015-07-17 17:12:16 +02:00
bcbd4da656
Merge branch 'master' of https://github.com/tgstation/-tg-station into lizardmov
...
Resolved Conflicts:
code/game/objects/items/weapons/AI_modules.dm
2015-07-16 20:10:20 -06:00
d72cbcaf2f
- fixes handcuff overlay on monkey not showing.
...
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
2015-07-17 01:15:21 +02:00
50fb67ca65
how can one man be so bad at git
2015-07-16 16:07:22 -06:00
7cd4a09ed7
Merge pull request #10592 from AlexanderUlanH/tables
...
Brings Tabling in line with newer stuns
2015-07-16 19:38:14 +02:00
9463dd7e70
Merge pull request #10613 from Ikarrus/rwindow-heat
...
Reinforced windows and windoors are a bit more resistant to fires and blasts
2015-07-16 18:42:45 +02:00
3e9ab4e3c1
Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/__HELPERS/unsorted.dm
code/game/objects/items/weapons/tanks/watertank.dm
code/modules/reagents/Chemistry-Recipes.dm
2015-07-16 14:09:12 +02:00
ca419e47c6
adds a 'TWANG' sound effect for guitars when hitting something
2015-07-16 07:59:10 -04:00
34db8dd695
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/mecha_equipment.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/equipment/weapons/weapons.dm
code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
3249d63631
Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
...
Conflicts:
tgstation.dme
2015-07-16 19:15:48 +08:00
e968c9e03c
Fixes dog bed dropping metal on deconstruction.
...
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
2015-07-16 13:04:44 +02:00
ae417d2a03
Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
code/ATMOSPHERICS/components/binary_devices/pump.dm
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
code/ATMOSPHERICS/components/trinary_devices/filter.dm
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
code/ATMOSPHERICS/components/unary_devices/Freezer.dm
code/ATMOSPHERICS/components/unary_devices/cryo.dm
code/ATMOSPHERICS/components/unary_devices/unary_base.dm
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
code/modules/events/vent_clog.dm
code/modules/mob/living/carbon/human/species.dm
config/admins.txt
2015-07-16 04:27:25 -06:00
7b7a3b1d73
MergeConflict+Request
2015-07-16 18:13:27 +08:00
6a3b9ef284
Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
...
Conflicts:
code/game/objects/items/weapons/handcuffs.dm
2015-07-16 18:11:33 +08:00
2641e1a684
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Procs
2015-07-15 23:52:55 +02:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
92f728077e
Merge pull request #10612 from Ikarrus/grenades_burn
...
Fixes grenade casings burning forever
2015-07-15 14:30:07 -05:00
5f7afb8782
Let's not spam people with drenching messages.
2015-07-15 20:08:53 +02:00
5a78777daf
Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans.
...
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
2015-07-15 19:49:23 +02:00
d1175653dd
- Reverts Map and Lizardmov changes
...
- Asimov's subject can now be modified from "human beings"
- You can examine AI modules to check their laws
2015-07-15 08:36:32 -06:00
f96fdab622
CuffSprites
2015-07-15 19:38:29 +08:00
phil235
bgobandit
xxalpha
Aranclanos
phil235
KorPhaeron
Ergovisavi
Ikarrus
Cheridan
WJohn
Swag McYolosteinen
GunHog
Steelpoint
Remie Richards
duncathan
MMMiracles
Firecage