6807b1ae48
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
0f6a60600d
Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
...
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +02:00
081bae6740
Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
...
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
5be93a2b1a
Merge pull request #8635 from Xhuis/phazon_nerf
...
Phazon construction nerf
2015-04-02 20:27:32 +11:00
f10d0df8cf
Merge remote-tracking branch 'origin/master' into mining
2015-03-31 18:31:12 +12:00
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12:00
8c796a0756
Phazon construction nerf
2015-03-30 13:38:31 -04:00
c8e0c16d09
Merge pull request #8520 from MrPerson/effect_cleanup
...
Effect pooling
2015-03-30 01:21:40 +11:00
0964979a90
bitch says she wanna keep her throat warm
2015-03-26 21:16:25 -05:00
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
b6c71dc50d
Effect pooling
...
obj/effect/effect all pool themselves.
PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist().
RCD's now delete their spark system and properly garbage collect.
2015-03-24 11:44:49 -07:00
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
ca9f31a0e3
* Unified the firing proc for energy and ballistics mech guns
...
* Fixes incendiaries bullets runtiming on qdel
2015-03-17 23:58:03 +01:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
c0d286ca72
Merge branch 'chem_synth' of git://github.com/lolnon/-tg-station into lolnon-chem_synth
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-02-14 22:42:42 -06:00
1c81aa37a9
Merge pull request #7330 from Menshin/variables_clusterbangs
...
Ported the variable payload clusterbangs from sayustation
2015-01-28 09:25:50 -06:00
8c893f6aca
Merge pull request #7065 from phil235/GibtoniteLogFix
...
Gibtonite log fix
2015-01-25 00:29:18 -06:00
8f10dea61a
Ported the variable payload clusterbangs from sayustation.
2015-01-24 16:36:30 +01:00
1b6831dab1
splits gun.dmi up into multiple files
2015-01-17 15:34:30 -08:00
8b3cff9281
Forgot a ephedrine -> epinephrine
2015-01-16 19:29:25 -08:00
bc9d48fa42
Mutadone and Mannitol, tweaks and changes.
2015-01-16 19:28:13 -08:00
38070820f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup
2015-01-16 17:25:50 -08:00
f3398e58a9
Removes Star Trek chemistry and transfers us to Goon Chemistry.
2015-01-16 17:21:36 -08:00
3594c96aca
Merge pull request #7090 from Firecage/HONKER_mousetrap_mortor
...
Fixes the issue of mousetrap mortars firing unarmed mousetraps.
2015-01-16 14:22:30 +01:00
b67aaffc86
Makes the mousetrap mortar fire armed mousetraps.
2015-01-15 13:38:41 +02:00
9e8531448a
Fixes admin logging of gibtonite and gibtonite deposit. Drilling it with a mech, using a kinetic accelerator, and using a resonator log the attacker's name.
...
Gibtonite and gibtonite deposit being triggered by an explosion is now correctly logged.
The explosion of the gibtonite deposit (outside of mining level of course) is now logged.
2015-01-15 00:56:50 +01:00
674b3b65c0
Merge pull request #6968 from phil235/LockdownMalfFix
...
Fixes malf AI lockdown affecting doors on away missions
2015-01-14 14:58:10 -03:00
8c0e20f31c
Merge pull request #6994 from Boggart/mechcontrolconsolefix
...
Fixes incorrect icon for exosuit control console.
2015-01-14 03:09:18 -03:00
96931efa9c
Changes Oddysseus chemical synth to be dependent on can_synth instead of the arbitrary reagent_state value.
2015-01-13 05:00:15 +00:00
435ccf7ff9
* OOP'ed ear damages/deafness status updating
...
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
2015-01-13 00:40:46 +01:00
3600714480
Fixes incorrect icon for exosuit control console.
...
Fixes incorrect icon for powered exosuit control console, it was accidentally setting the icon state to the unpowered one.
2015-01-12 03:21:36 -07:00
a55e6a70be
Fixes malf AI lockdown affecting doors on z levels other than station and mining.
...
Replaces a lot of z level numbers in code by their respective defines.
Adding a define for the Mining asteroid z level.
2015-01-11 15:39:32 +01:00
0f19537c2d
Merge pull request #6721 from phil235/CargoCrateNameFix
...
Many typo fixes
2015-01-10 20:11:13 -03:00
56bad0f7ce
Merge pull request #6747 from paprka/gunchangesv2baby
...
Further changes to the ranged stun system
2015-01-08 16:09:37 -08:00
9e235dd67a
* Added a default proc for prying open unpowered/broken machines using a crowbar
...
* Added an option to not set the machine when checking for attackhand() in machine class (prevent infitine loops if a machine doesn't have a dialog and called ..())
* Sleepers, cryo cells and DNA scanners can now be pried open when non-fonctional
* Cleaned and standardized DNA scanners code by using the general machine class
* Made sure destroyed machines drop their contents
* Added icon updating for mech bay power console and mecha control console (operational, powerless and broken states)
* Cleaned up and aligned the borg recharger station code with its parent code
* Added powerless codersprites for the borg recharger station
* Non operational borg recharger station can now be pried open from the outside.
2015-01-06 23:57:19 +01:00
9355baf97c
Merge branch 'master' of https://github.com/tgstation/-tg-station into CargoCrateNameFix
...
Conflicts:
code/controllers/supply_shuttle.dm
code/game/objects/items/weapons/RCD.dm
2015-01-05 22:07:08 +01:00
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
a8f5626183
Fixes typos in crate names from the cargo shuttle.
...
Fixes "mproper" in area and mech names when renaming them.
Fixes typos in RCD description.
Fixes typo in shock message.
2015-01-01 03:04:18 +01:00
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
1846489593
Merge pull request #6589 from phil235/SiliconPunchMsgFix
...
Fixes message typos
2014-12-27 11:48:54 -03:00
8a56892892
Fixes message typos in silicon punch message, mecha construction description, message when taking blood sample.
2014-12-26 12:13:54 +01:00
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
phil235
Jordie
ACCount12
Xhuis
pudl
MrPerson
Remie Richards
Miauw
Menshin
Menshin
Cheridan
paprka
Iamgoofball
phil235
Firecage
tkdrg
lolnon
Boggart
hornygranny
Razharas
phil235