Supermichael777
d69c6615a8
Fixes stealth nerf to detectives gun ( #31125 )
...
* Fixes stealthnerf to detectives gun
Having knockdown healed stamina damage, but also needed stamina too keep you down. This rectifies the extra stamina healing
* WEW LADS
2017-10-03 18:14:01 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
LetterJay
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
CitadelStationBot
2d48a0cf50
[MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. ( #2967 )
...
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
CitadelStationBot
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
Poojawa
0eb8cf0235
Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning ( #2759 )
...
* In hands of plasma weapons/tweaks
* Icon override states for all clothes
* a few compile issues ~
* Adds a new badmin button and plasma rifle case
* better cleanup of the sound effect
* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
LetterJay
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
CitadelStationBot
41b0f9f9d4
Gorillas
2017-08-20 19:56:21 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
e5b7eefffe
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
2017-08-16 17:53:39 -05:00
LetterJay
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
79e6963aca
Hallucinations 3.0
2017-07-30 19:58:28 -05:00
CitadelStationBot
3f8acbc2c4
Removes bows ( #2163 )
2017-07-28 02:53:47 -07:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
a4d968ec82
Fixes missiles being able to ricochet
2017-07-15 22:31:05 -05:00
CitadelStationBot
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
CitadelStationBot
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
5dd25bda95
Minor Projectile Reflection Refactor ( #1926 )
2017-07-07 10:33:59 -07:00
CitadelStationBot
4796ede787
Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
b2d288d1f8
Merge pull request #1225 from Citadel-Station-13/upstream-merge-27611
...
[MIRROR] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
2017-06-05 23:06:18 -05:00
LetterJay
be38799933
cleanup
2017-06-05 22:39:51 -05:00
LetterJay
f2730839d4
Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
...
[MIRROR] Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot
e5f2a09622
Pixel projectile ricochets and reflections! ( #1220 )
2017-05-27 13:27:52 -07:00
CitadelStationBot
c3d2dbe00a
Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value
2017-05-27 09:27:00 -05:00
CitadelStationBot
3c60a6c82f
Aux base plasma turrets now have range equal to the range they fire in
2017-05-25 10:37:50 -05:00
CitadelStationBot
36c14b3e71
fixes AOE projectile automatic proximity detonation
2017-05-25 07:29:47 -05:00
CitadelStationBot
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
CitadelStationBot
25f7f32f37
Auto Rifle Armour Piercing Increase
2017-05-24 05:54:45 -05:00
LetterJay
db9f2a6d74
rej cleanup
2017-05-23 06:15:33 -05:00
LetterJay
e675b3becc
var/mine_range
2017-05-22 17:35:40 -05:00
LetterJay
288c072544
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474
2017-05-22 17:30:31 -05:00
LetterJay
9df8057e0e
Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344
...
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-22 12:40:18 -05:00
LetterJay
8791ad036f
Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268
...
[MIRROR] World.dm Refactor
2017-05-22 12:39:52 -05:00
LetterJay
3548ed5e3e
i'll fix this in another PR
2017-05-22 12:27:59 -05:00
LetterJay
d1db0044d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
2017-05-22 11:52:18 -05:00
CitadelStationBot
f43a861d6e
Plasma cutters will mine further but will go less distance in open air
2017-05-21 22:27:50 -05:00
CitadelStationBot
312ae2218e
[MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time ( #1069 )
...
* fixes chameleon laser guns blowing up welding tanks for real this time
* Delete energy.dm.rej
* Update energy.dm
2017-05-21 18:30:12 -07:00
Poojawa
186ed2acbb
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
2017-05-21 00:44:08 -05:00
Poojawa
45ba084c6a
Merge branch 'master' into upstream-merge-27344
2017-05-20 23:26:28 -05:00
CitadelStationBot
c36eee94bd
Adds modified syringe guns
2017-05-19 06:25:23 -05:00
CitadelStationBot
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
