6f49beafed
FIXED SPACING ERRORS BECAUSE MY KEYBOARD IS MADE OF CLOWNS-GRADE BANANIUM
2015-07-26 19:30:57 -04:00
c9870a0fef
Merge pull request #10834 from bgobandit/lighterfluff
...
Fixes lighter-related bugs.
2015-07-26 13:09:12 +03:00
3ec42691b8
Adds more feedback to traitor dehydrated space carp. Fixes spelling.
2015-07-26 00:00:04 -04:00
82d964957a
Merge pull request #10687 from Steelpoint/OfficerMask
...
[FLUFF|BALANCE] Security Officers Sec Breathmask in Internals Box
2015-07-25 20:19:38 +10:00
f5ae59a046
Merge pull request #10700 from Ergovisavi/more_fire
...
Molotovs and a throw fix
2015-07-25 20:05:05 +10:00
15a36f1a4e
Merge pull request #10666 from duncathan/fuck
...
Restores RPD placement delay for disposals (#10645 )
2015-07-25 19:12:48 +10:00
9b0b4e1aa4
Merge pull request #10710 from xxalpha/cablecoilbackpack
...
Fixed storage not updating when joining cable coils.
2015-07-25 19:12:26 +10:00
cd280f9d9f
Merge pull request #10779 from xxalpha/rw_agent
...
Made Agent IDs rewrittable.
2015-07-25 19:11:06 +10:00
ad2d7e1d0f
Merge pull request #10789 from kingofkosmos/reentercorpselink
...
Clickable re-enter corpse links
2015-07-25 19:10:06 +10:00
717be49a3c
Fixes lighter-related bugs.
2015-07-24 11:00:23 -04:00
68b5dd2979
Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/obj/guns/energy.dmi
2015-07-24 16:59:21 +08:00
05e227073d
Merge pull request #10782 from phil235/VendingCharges
...
Mech & vending machine fixes
2015-07-24 00:02:31 -05:00
750e5d9b5e
Changed span classes to include the re-entering link.
2015-07-23 18:58:15 +03:00
1ab69f9fda
Readding loading chef food into snack vending mechines.
...
Adding a mention about being able to load food into snack vending machines in the cook book.
Removing the power setting of the microwave. The microwave upgrades makes it unneeded.
2015-07-23 16:06:03 +02:00
b2948fcab7
Merge pull request #10659 from phil235/HandcuffOverlayFix
...
Handcuff, fire, overlays_standing fixes
2015-07-23 22:21:52 +10:00
0095637eee
Clickable link added to all re-enter corpse messages.
2015-07-23 10:50:45 +03:00
2aa05fdc45
Changed input method
...
Edit changelog
2015-07-23 04:23:38 +01:00
1759d492f0
Made Agent IDs rewrittable.
...
Added antag check for forging.
2015-07-22 22:38:13 +01:00
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
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
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
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
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
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
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
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
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
bgobandit
Razharas
Jordie
Steelpoint
Cheridan
kingofkosmos
phil235
xxalpha
Aranclanos
phil235
Ergovisavi
Ikarrus
WJohn
Swag McYolosteinen
GunHog
duncathan
MMMiracles
Firecage