Commit Graph

98 Commits

Author SHA1 Message Date
Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
PsiOmega e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-18 18:29:01 +02:00
PsiOmega 75c7313c46 On merge changes and map conflict fixes. 2015-08-18 18:19:51 +02:00
PsiOmegaDelta 74b8f6c3be Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-08-17 09:44:21 +02:00
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
mwerezak f09b754a19 Fixes #10636 2015-08-16 15:20:59 -04:00
GinjaNinja32 e9ff87fbd6 Lattices, shuttle windows, and shuttle engines now rotate correctly with client.dir 2015-08-02 20:50:47 +01:00
GinjaNinja32 16bcc04c83 Windows now rotate correctly with client.dir 2015-08-02 18:06:02 +01:00
mwerezak 32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-06-28 22:35:14 -04:00
Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
2015-06-07 14:05:54 +03:00
PsiOmegaDelta a07d20d657 Ports /tg/'s meteor implementation.
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
2015-06-05 14:58:35 +02:00
GinjaNinja32 94e19592cf objects/effects, objects/structures 2015-05-30 14:37:40 +01:00
Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
PsiOmegaDelta 66b8d67637 Merge pull request #9390 from mwerezak/attack-animation
Attack animations
2015-05-21 06:52:30 +02:00
mwerezak c289975498 Adds attack animation calls for a few common machines and structures
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00
mwerezak 87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
Zuhayr 358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr 8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr 966d797e07 Converts bat to use the material system. 2015-05-16 19:59:21 +09:30
Mloc 16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01:00
Kelenius 3fa79f8d51 Removes click cooldowns almost everywhere.
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
PsiOmega ca7fa2aa19 Grilles and rods.
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega 464d702d4b Mob refactoring.
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
2015-03-29 10:44:31 +02:00
Zuhayr a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
PsiOmega cd5a2fc52e Bonus: Makes the tinted windows respect power failures. 2015-02-10 10:16:58 +01:00
mwerezak 0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
unknown 39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
Chinsky b83f1ac3d2 Adjustable tint windows. Use buttons to change opacity. Super advanced technology to introduce milder alternative to metal shutters everywhere. 2015-02-06 10:33:41 +03:00
mwerezak 41816c26bf Fixes windows taking excessive damage from projectiles 2015-02-06 00:03:09 -05:00
Kelenius cee3c3eeff Replaces icon proc with image 2015-01-20 16:11:05 +03:00
Kelenius 1949f105f1 Removes a debug world << 2015-01-20 14:55:26 +03:00
Kelenius 5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +03:00
Zuhayr a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
Zuhayr 3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr b556609e27 Replaces some macros. 2014-12-08 10:34:36 +10:30
Zuhayr 1211360118 Fixes #6974 2014-12-08 05:00:54 +10:30
PsiOmega 52346094f8 Fixes #7214.
Dismantling a window should now return an appropriate number of sheets for its type.
2014-12-03 11:06:33 +01:00
Mloc-Argent 117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega 0f8156e77e Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00
mwerezak b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00
Zuhayr cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
Zuhayr 31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr 4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
mwerezak ab2b4608e0 Fixes #6702 and cleanup
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
2014-11-12 20:09:04 -05:00
Akai Alonkai 44f7e4edd8 Full Window returns stacked glass
Tweaked code to make a full window return a stack of two, rather than
two separate sheets.
2014-11-05 16:53:17 -05:00
Akai Alonkai 7243fdb284 Add Window Dismantling
Enables dismantling of a window (100% return) with a wrench, if the
window is fully unsecured. Windows which cannot be dismantled will
return a message saying so for clarity. Dismantling displays a visible
message for clarity.
2014-11-05 00:24:56 -05:00
RavingManiac e0d48950b4 Doors can now be broken through damage. Broken doors can be crowbarred open. High-securiry doors automatically bolt themselves when broken. Doors which are damaged, but not broken, can be repaired with sheet metal. Broken doors must be reconstructed. Spark overlays for damaged and broken doors.
Windows and doors will display messages indicating extant of damage as they are damaged (e.g. "Cracks begin to appear in [src]!")

Metal rods can substitute for crowbars to force unpowered and broken doors, as well as firelocks.

Window damage code cleaned up and centralized.
2014-10-26 00:59:03 +08:00