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
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
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
60f05dc1ff
AlienBox+AlienPaper
2015-07-15 15:05:01 +08:00
c713797566
Makes it easier to check freeform boards by adding a cancel button to inputs.
2015-07-14 23:12:40 -06:00
ef548f6f67
Adds Lizardmov AI Module
2015-07-14 22:35:05 -06:00
de288d013e
Merge pull request #10591 from bustygoku/Under-Pressure
...
Tanks Show Pressure When Examined
2015-07-14 15:51:47 +02:00
83a435273e
Fixes grenade casings burning forever
2015-07-13 22:48:01 -06:00
723e6d6358
Merge pull request #10561 from xxalpha/hugboxone
...
Adds an empty hugbox.
2015-07-13 22:11:11 -05:00
4d0739c387
LowerCase K
2015-07-13 17:31:50 -07:00
f08d4f4085
Merge pull request #10554 from nukeop/rcdbugfix
...
Fixes RCD-related issues
2015-07-14 01:04:48 +01:00
359a270de6
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
72547af481
Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
...
Conflicts:
code/modules/mob/living/carbon/human/species.dm
2015-07-14 01:02:37 +02:00
b570af6795
Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
...
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
bde367b9b9
KPa Added
2015-07-13 15:30:21 -07:00
de699d3b5b
Tanks Show Pressure When Examined
2015-07-13 04:09:39 -07:00
37cfc11cd4
Merge pull request #10481 from Ikarrus/ganggangganggang
...
Gang Mode Update
2015-07-12 19:37:54 -04:00
71ac607a6b
Revert "merge conflicts?"
...
I fucked this up
2015-07-12 12:52:32 -06:00
xxalpha
Aranclanos
phil235
Ergovisavi
phil235
Ikarrus
Cheridan
WJohn
Swag McYolosteinen
GunHog
Steelpoint
duncathan
MMMiracles
Firecage
bustygoku
Remie Richards
bustygoku