The-clown-known-as-Pepe
13eedff767
Fixes rubber shot after unintended nerf. ( #31316 )
...
* Update bullets.dm
* fix
* refactor
* Update ammo_casings.dm
2017-10-05 17:48:37 -05:00
LetterJay
c2fe00cebd
Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264
...
[MIRROR] Preliminary blast cannon cleanup
2017-10-04 18:44:38 -04:00
LetterJay
4610a7a61d
Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180
...
[MIRROR] removes carp piggyback exploit
2017-10-04 18:43:31 -04:00
LetterJay
e6ccc7077a
Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279
...
[MIRROR] why plus a minus value and not just minus the value...
2017-10-04 18:43:04 -04:00
kevinz000
d9d08ed57f
Preliminary blast cannon cleanup ( #31264 )
...
* Update blastcannon.dm
* Update blastcannon.dm
* Update blastcannon.dm
2017-10-04 16:32:41 -05:00
kevinz000
9e59a29e35
Update projectile.dm ( #31180 )
2017-10-04 14:51:16 -05:00
kevinz000
1a3fc9f1c6
why plus a minus value and not just minus the value... ( #31279 )
...
* Update bullets.dm
* Update visuals_icons.dm
* Update asteroid.dm
2017-10-04 14:03:20 -05:00
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
LetterJay
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
LetterJay
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
ShizCalev
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -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
LetterJay
a099fb627c
Merge pull request #2918 from Citadel-Station-13/upstream-merge-30953
...
[MIRROR] Suiciding with a gun blows your brain out
2017-09-27 16:31:25 -04:00
LetterJay
2163132c52
Update ballistic.dm
2017-09-27 15:10:59 -05:00
LetterJay
5f26685273
Merge pull request #2940 from Citadel-Station-13/upstream-merge-30894
...
[MIRROR] Fixes suppressing weapons in your bag / pocket
2017-09-26 14:58:57 -04:00
kevinz000
2612f2b9cf
Update beam_rifle.dm ( #2943 )
2017-09-26 07:54:30 -04:00
ShizCalev
b79dd78089
Fixes suppressing weapons in your bag / pocket ( #30894 )
...
* Fixes suppressing in pocked and w_class issues
* Used defines for some things
* Reworded
* Removed the now redundant initial_w_class var
* Early returns
* Null
2017-09-26 04:19:44 -05:00
LetterJay
67c3dc63e1
Update ballistic.dm
2017-09-23 13:52:55 -05:00
JJRcop
49abaf72f4
Suiciding with a gun blows your brain out
2017-09-23 11:12:21 -05: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
oranges
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot
76085457d6
[MIRROR] Fix maple shotgun icon_state ( #2829 )
...
* Fix maple shotgun icon_state (#30796 )
* Fix maple shotgun icon_state
2017-09-17 22:26:50 -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
CitadelStationBot
941f63e7f9
[MIRROR] Adds a tip to examine for L6 SAW machinegun ( #2779 )
...
* Merge pull request #30724 from JJRcop/saw_that_but_didnt_see_that
Adds a tip to examine for L6 SAW machinegun
* Adds a tip to examine for L6 SAW machinegun
2017-09-15 03:34:15 -05:00
CitadelStationBot
d64c23b7f9
[MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts ( #2740 )
...
* Fix syndicate toy C20r and L6 Saw not having riot darts (#30645 )
* Add riot darts back into toy C20r and L6 Saw
Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.
* Comments are good
Especially when inheritance makes everything weird.
* Fix syndicate toy C20r and L6 Saw not having riot darts
2017-09-13 20:57:54 -05:00
LetterJay
1d040d46d1
Merge pull request #2701 from Citadel-Station-13/upstream-merge-30564
...
[MIRROR] Spetsnaz Pyro Bundle Rebalance
2017-09-12 19:17:23 -05:00
LetterJay
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
BeeSting12
9e83717c92
Spetsnaz Pyro Bundle Rebalance ( #30564 )
...
* im gay
* oops did a thing wrong
* wew
2017-09-11 12:32:58 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
Kerbin-Fiber
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
LetterJay
cf46abecb3
Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
...
[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -05:00
kevinz000
fcddd32703
Merge pull request #2195
2017-08-29 22:26:58 -07:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
kevinz000
f45f5bbf3d
quadruple wew
2017-08-29 10:02:18 -07:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
064ade469f
sync
2017-08-29 09:35:55 -07:00
kevinz000
498bd61928
sync
2017-08-29 09:12:56 -07:00
CitadelStationBot
3fe08c3cc7
Prevents medbeams from crossing themselves
2017-08-29 09:50:47 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -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
