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
d0e9a5c0c9
Nerfs the kinetic accelerator.
...
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
1c219f0ebe
A lot of stuff
2015-03-31 18:30:09 +12: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
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
cb96e65f1b
Merge pull request #8254 from Steelpoint/HoSGunSpelling
...
[BALANCE]Buffs the Head of Security's Firearm.
2015-03-10 22:09:46 +01:00
a5ba5972b4
AdditionalSpelling
2015-03-10 17:26:05 +08:00
79857b0eac
InitalCommit
2015-03-09 17:02:34 +08:00
7a8e78a4c3
this kills the object verbs
2015-02-25 00:19:53 -08:00
9ce2add084
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
1d552123dc
hos gun revert
2015-02-24 21:54:48 -08:00
393123b50b
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
code/modules/projectiles/gun.dm
icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
da53175ad5
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08: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
b30aaf3b47
fixed turret slotflag, inheritance vars
2015-02-23 14:55:26 -07:00
55dcc82f45
fixes leftover delay line
2015-02-20 01:58:32 -08:00
1221f012c6
Breach to Disable
2015-02-20 11:41:56 +08: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
dbc6b91921
Merge branch 'updaterclean' into zipzaps
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-18 22:03:03 -07:00
4f6c74d291
replaces turret egun with ecannon
2015-02-18 21:24:07 -07:00
074a139576
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-18 02:29:07 -08:00
8b53405b17
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-18 12:50:05 +08:00
dcf99380b6
Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos
...
Introducing the Ion Carbine!
2015-02-18 00:16:33 +01:00
9d7b7a34ae
Fixes my merge error.
2015-02-17 14:47:26 -06:00
71758715fa
some typo fixes
2015-02-15 13:33:15 -08:00
8b12b14f59
hospistol and disabler stun revolver
2015-02-15 13:31:31 -08:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
14c9abaaee
Merge pull request #7539 from Iamgoofball/kinetic
...
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
940601bcfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
0b0737b292
Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos
...
Conflicts:
icons/mob/belt.dmi
icons/obj/guns/energy.dmi
2015-02-12 09:08:31 -06:00
566fd07593
Merge pull request #7651 from paprka/tacticalfleshlight
...
makes flashlight attaching more modular
2015-02-12 07:55:26 -06:00
6613851028
Merge pull request #7593 from Cheridan/pin_fix
...
Pin fixes, additions
2015-02-12 06:43:11 +00:00
5786626c87
Introducing the Ion Carbine!
...
- Adds the Ion Carbine, a compact version of the Ion Rifle that users
can carry on their belt or in a regular backpack.
- Adds the Ion Carbine to R&D, replacing the Ion Rifle.
- Ion Rifle now starts with a pin installed as it can no longer be made
in Science.
- The Ion Rifle and Ion Carbine can now accept Seclites as an
attachment.
2015-02-10 18:03:30 -06:00
eabbd88858
makes flashlight attaching more modular
2015-02-10 14:17:57 -08:00
e5e8b27790
Merge pull request #7491 from paprka/simplyepicbuff
...
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
3da8f70e4d
fixes #7608
2015-02-07 20:48:50 -06:00
ea3bb2e80b
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler
...
Conflicts:
code/modules/research/designs/mechfabricator_designs.dm
2015-02-06 13:19:15 +08:00
cd9a08e684
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
code/modules/projectiles/ammunition/energy.dm
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-04 18:36:50 +08:00
791381394c
Ports the kinetic accelerator changes from NT
2015-02-03 21:19:30 -08:00
53a1590a9e
fixes ebow sound when reloading
2015-02-03 14:48:04 -08:00
8601e385a5
BreachingShot
2015-02-02 20:14:23 +08:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
8173cd2460
fixes pulse rifles not being emp proof apparently
2015-02-01 23:27:56 -08:00
f6be6754ae
readds the stun revolver (oops)
2015-02-01 21:32:51 -08:00
a5dcd1abd8
improves ert spawning and centcomm
2015-02-01 21:16:11 -08:00
fd88ccc024
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
2015-01-31 18:03:38 +08:00
phil235
ACCount12
pudl
Fayrik
phil235
Steelpoint
paprka
Remie Richards
Delimusca
paprka
GunHog
Cheridan
Swag McYolosteinen
Cheridan
Iamgoofball