809a1be279
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-02-25 18:50:42 +01: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
3e100729bc
Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you.
2015-02-22 23:02:07 +01: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
47a631b1c7
Merge pull request #7713 from paprka/wotdefuk
...
fixes improvised shotgun back slot invisible shit
2015-02-14 16:01:39 -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
b2d6ce5481
Merge pull request #7668 from dannno/suicidefix
...
Fixes #7647
2015-02-14 12:12:38 +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
cff73d83c6
fixes improvised shotgun back slot invisible shit
2015-02-13 14:04:23 -08:00
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
db0fd07f0f
fixes blowing your brains out without a gun
2015-02-12 15:05:45 -05: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
b34c5180ae
modifies and fixes suicide messages for guns and bananas
2015-02-11 22:39:11 -05: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
5f884b6017
Merge pull request #7496 from dannno/killyoselfmyman
...
Adds proper suicide messages to like a lot of stuff
2015-02-03 16:43:09 -06: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
c48bf44a47
framework for a future "suicide hotline" job
2015-02-01 19:44:54 -05:00
a0b2e72b4c
gun suicide messages
2015-02-01 11:04:40 -05:00
6275e9f88a
waht
2015-02-01 09:46:29 -05: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
Steelpoint
paprka
Remie Richards
Delimusca
paprka
phil235
GunHog
Cheridan
Swag McYolosteinen
dannno
Cheridan
Iamgoofball