Commit Graph

8641 Commits

Author SHA1 Message Date
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
Cheridan
5d5e4de951 Merge pull request #21372 from phil235/pdapenshit
Pda overlays and pAi fix
2016-11-06 00:12:23 -05:00
Joan Lung
0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit
Easy fix bundle
2016-11-05 19:41:27 -04:00
Joan Lung
241e6e75b8 Merge pull request #21359 from phil235/WindowExplosionBlockFix
reinforced window and telehulk bugfixes
2016-11-05 19:33:15 -04:00
Cheridan
3dd35cc0b1 Merge pull request #21365 from ChangelingRain/glowfixes
You can now proselytize false walls + glow fixes
2016-11-05 18:30:59 -05:00
Cheridan
6a885d9500 Merge pull request #21342 from phil235/TransitShit
Fixes transit tubes
2016-11-05 17:21:24 -05:00
PKPenguin321
43692c6bad buffs whetstones (#21339)
makes it so anything sharpened with them becomes is_sharp_accurate
2016-11-05 14:12:20 +01:00
phil235
93ac302a2e Fixes pAI face not being updated when killed by EMP (or any non wipe/suicide death). 2016-11-05 03:22:20 +01:00
phil235
59f2a4e10e Adds some image overlays on PDAs when they had an id (bottomleft corner green light), when their light is on (bottom right corner), when they have an item inserted (top), when they have a pai inserted (screen changes).
Also, altclicking a PDA without an ID now removed the inserted item.
Fixes some bugs. Simplifies id_check() proc.
2016-11-05 03:15:04 +01:00
phil235
b8e5bb22bc Moves bodybag closet into the closet folder where they should be.
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
2016-11-05 00:00:28 +01:00
Joan Lung
990942481f You can now proselytize false walls + glow fixes 2016-11-04 11:53:48 -04:00
Joan Lung
d4643f032c Proselytizer conversion now accounts for existing materials better (#21334)
* Proselytizer conversion now accounts for existing materials better

* shitfuck.

* move the god damn defines
2016-11-04 15:35:00 +01:00
phil235
8cb3736221 Fixes turf having two contents_explosion()
Fixes hulk plus telekinesis being able to hulk smash things from a distance.
2016-11-04 00:33:51 +01:00
phil235
48af5e5927 Removed another outdated comment 2016-11-03 19:19:32 +01:00
phil235
b0b5a90bd7 Requested changes 2016-11-03 19:03:04 +01:00
phil235
26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235
51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
oranges
f57357a049 Merge pull request #21316 from ChangelingRain/unflappable
Plastic flaps are once again immune to being hit in melee
2016-11-03 10:11:17 +13:00
Cheridan
19c6919e88 Merge pull request #21309 from phil235/ClonePodRuntimeFix
Fixes two runtime from clonepod.
2016-11-02 06:05:11 -05:00
Joan Lung
02e54446d8 Hulks no longer oneshot literally every clockwork structure (#21283)
* Hulks no longer oneshot literally every clockwork structure

* rrrrr

* why the fuck did you ask me to make this a proc????

* hulks, why.
2016-11-02 22:52:42 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Cheridan
c30441148e Merge pull request #21308 from phil235/AlienAcidFix
Fixes alien acid not melting turfs.
2016-11-01 09:16:22 -05:00
Cheridan
37c6f1e1ae Merge pull request #21310 from ChangelingRain/gearbits
Brass windows and windoors no longer drop full sheets of brass when destroyed
2016-11-01 09:09:51 -05:00
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04:00
phil235
0876b424a7 Tiny fixes and suggested changes.
Blight ability will still color your hair, and will be cleared when cured.
2016-11-01 01:59:23 +01:00
oranges
6a411a5a97 Merge pull request #21266 from kevinz000/revert1
Reverts Hardlight Bows
2016-11-01 11:31:40 +13:00
Joan Lung
883e7f745b Plastic flaps are once again immune to being hit in melee 2016-10-31 18:06:33 -04:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
Cheridan
2ae59bf7dc Merge pull request #21280 from ChangelingRain/axemeaquestion
Brass windows are now slightly harder to destroy
2016-10-31 11:08:44 -05:00
Joan Lung
d0f0b74957 Clockwork windows and windoors no longer drop full sheets of brass when destroyed 2016-10-31 10:27:31 -04:00
phil235
e2c5cbb334 Fixes two runtime from clonepod.
Moves countdown effects into the effect folder instead of being in their own module.
2016-10-31 14:34:25 +01:00
phil235
d1bbfd92ba Fixes alien acid not melting turfs. I also made turf melting a bit faster to be consistent with airlock melting. (around a minute) 2016-10-31 13:42:57 +01:00
Cheridan
d169779424 Merge pull request #21273 from bgobandit/immortalization
Adds a suicide message to an object lacking one.
2016-10-31 05:07:59 -05:00
Cheridan
c5ff8b987e Merge pull request #21245 from MrStonedOne/byondinitclean
Cleans up some init procs from world start.
2016-10-30 16:05:29 -05:00
Joan Lung
8cf817cfec Brass windows are now slightly harder to destroy 2016-10-30 11:51:21 -04:00
bgobandit
1999445b4f whoopsies 2016-10-30 04:06:06 -04:00
bgobandit
8b01341cfc adds suicide messag 2016-10-30 04:04:23 -04:00
oranges
d3bbe1634e Merge pull request #21248 from lordpidey/wallfix
Falsewalls are now less obvious on inspect
2016-10-30 19:16:32 +13:00
kevinz000
7e364fd79a rip 2016-10-29 20:45:23 -07:00
oranges
3f0d87720f Merge pull request #21260 from Kraseo/doomslayer
Renames the doomslayer chainsaw to "THE GREAT COMMUNICATOR"
2016-10-30 10:06:37 +13:00
Joan Lung
7262c16328 Merge pull request #21243 from lzimann/selflog
You can see your own attack log once again
2016-10-29 15:50:55 -04:00
Kraseo
22ccfd8e62 RIP AND TEAR 2016-10-29 20:46:55 +02:00
Mike Long
4bd80f021d Fixes #21240 2016-10-28 20:52:03 -04:00
Joan Lung
df4bc0a093 Fixed a few bugs with clockwork proselytizers (#21221)
* Fixed a few bugs with clockwork proselytizers

* condensed

* formatting

* proselytizer.

* i need more sanity checks I think this crashed something

* proper!

* better desc

* sanity! SANITY!
2016-10-29 11:34:03 +13:00
bgobandit
e8f4166849 English and grammar fixes (#21198) 2016-10-29 11:32:04 +13:00
MrStonedOne
78c9ce1bfc Cleans up some init procs from world start.
`/turf`, `/turf/open`, `/turf/open/space`, `/obj` should now no longer have an `init[]` proc in byond.

This mostly abuses the fact that `for (var/thing in null)` works exactly the same as `for (var/thing in emptylist)`

`atmos_adjacent_turfs` is lazy init'ed and set back to null when empty. `GetAtmosAdjacentTurfs()` will always return a list for code that doesn't want to care.

`atmos_overlay_types`, and `proximity_checkers` lazy init and reset back to null when empty.

`armor` is now init'ed in `/obj`'s `New()` if it's blank. This could also be set to some lazy init system if somebody is feeling masochistic enough.

`/obj`s that both don't call parent in `New()` and don't set their own armor will have a null armor list. This might cause bugs so this change may get removed if that becomes an issue.

Minor slightly unrelated change that made doing this change easier, `add_overlay()` now *technically* works properly if given a list
2016-10-28 13:31:08 -07:00
Joan Lung
f8ca3860ca Merge pull request #21207 from Niknakflak/finally_getting_to_this
Toys toys toys toys
2016-10-28 15:40:50 -04:00
Lzimann
90d76b652c You can see your own attack log once again 2016-10-28 17:35:22 -02:00
NikNakFlak
2428844574 Does the thing 2016-10-28 12:33:36 -07:00
kevinz000
bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00