Commit Graph

867 Commits

Author SHA1 Message Date
S34N
d445cbc4de Fixes burst weapons not properly having weapon spread when dual wielded (#17149) 2021-11-24 09:53:14 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
SabreML
1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
Vi3trice
a3d515ce4e Makes the telegun a wee bit more sensible 2021-10-23 12:25:11 -04:00
variableundefined
56003f88ac Merge pull request #16884 from Qwertytoforty/A-simple-mob-problem
Adds a malf AI upgrade for engineering borgs, adds zipties to all emaged borgs.
2021-10-17 13:44:09 -05:00
Qwertytoforty
f9c4cff64c And a description change 2021-10-04 22:13:59 -04:00
Qwertytoforty
f45cdbf047 Cyborg variant, sprites 2021-10-04 20:36:41 -04:00
Qwertytoforty
d9135ece44 Adds 90% of the stuff 2021-10-04 17:26:13 -04:00
Qwertytoforty
957edb4420 Fixes being able to install 0 cost upgrades on an energy crossbow (#16861)
* Fixes being able to install 0 cost upgrades on an energy crossbow

* Just uses max_mod_capacity

* Update code/modules/projectiles/guns/energy/kinetic_accelerator.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-10-04 20:26:57 +01:00
variableundefined
5339cdf212 Merge pull request #16659 from Fox-McCloud/the-end-of-lethal-shot
Nerfs Shotguns
2021-09-19 11:25:02 -05:00
hal9000PR
3c52cea099 fix (#16728) 2021-09-18 15:36:35 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
variableundefined
6c085cf23b Merge pull request #16064 from michaelyesok/foampistol
Foam enforcer tweaks
2021-09-11 19:12:07 -05:00
variableundefined
d5639d1e7b Merge pull request #16674 from S34NW/fence-railings
Adds railings and fences
2021-09-11 13:11:42 -05:00
S34NW
adc250cdc5 we don't need these with the istype checks 2021-09-10 22:11:03 +01:00
S34NW
0c4dcd1b62 projectiles can pass 2021-09-10 19:07:02 +01:00
variableundefined
baa59c4042 Merge pull request #16654 from farie82/add_attack_log-ssd-tweak
Attack logs on SSD targets now only get the FEW loglevel if there is a user doing it
2021-09-09 17:14:59 -05:00
Fox McCloud
a081051133 Nerfs Shotguns 2021-09-08 12:17:08 -04:00
joep van der velden
4b22aa12da add_attack_logs ssd tweak
only overrides the log_level if the target is SSD AND there is a user
2021-09-07 21:04:29 +02:00
SteelSlayer
3cc83e6011 wand of slipping fixes 2021-09-06 12:23:27 -05:00
variableundefined
936fbf3194 Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
2021-09-01 19:46:04 -05:00
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration
[IDB IGNORE] Clothing .dmi file organisation
2021-09-01 19:44:59 -05:00
michaelyesok
9a7aadd3a0 Merge branch 'master' into foampistol 2021-08-30 00:18:12 +02:00
variableundefined
e4355d7d63 Merge pull request #16529 from chafla/foam-fixes
Ensure only pistol-type weapons can be holstered
2021-08-29 14:47:09 -05:00
Qwertytoforty
e9e7522076 Adds antimatter sniper rounds, changes variables around 2021-08-26 17:05:21 -04:00
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
variableundefined
c6c84c478d Merge pull request #15652 from E-MonaRhg/gamma_armory_buff_v2
Buffs to gamma armory v2
2021-08-14 11:30:15 -04:00
Matt
578eda4fae Update code/modules/projectiles/guns/projectile/toy.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-08-13 10:54:36 -07:00
chafla
0f0a18c6c7 Set holster default to false 2021-08-12 14:42:36 -07:00
chafla
3876f5b8fc Ensure revolvers are holsterable, with exceptions
Makes base revolver datum holsterable
Excludes grenade launchers, advanced mimery
2021-08-12 13:47:14 -07:00
chafla
138f71b286 Fix typo in enforcer desc while we're at it 2021-08-11 18:19:57 -07:00
chafla
d93089cf52 Make foam pistols able to be holstered 2021-08-11 18:18:30 -07:00
SabreML
2c0ae9c500 Refactors the 'Examine' status tab (#16330)
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
2021-07-26 18:11:57 +01:00
SteelSlayer
dab535ef16 cyborg laser fix (#16399) 2021-07-20 08:18:28 +00:00
Qwertytoforty
f8bc686abb Adds the B.S.G (#15798)
* Adds the 100% original and serious BSG

* Adds sprites

* prevents divide by zero

* Adds to protolathe, shield from projectiles, prevents hitting through walls

* adds sprites for inhands, pain, and suffering

* Finished the gun sprites.

* Adds admin version, sound effect, visual

* moves chain to base projectile, adds shitty sprite for bsg explosion

* Fixes it, maybe.

* I hate merge conflicts, gun sprites are back

* I need this, it seems.

* re-adds sprites back

* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip

* Apply grammer and spaceing suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Makes the code clearer, use update icon, fix shaded charge

* Better inhands, tweaked base sprite

* Better explosion effect, mochi suggestion, PR ready

* Accidently removed this

* I did not intend to put this in, I discarded this change

* Update settings.json

* Spelling and return removal

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Removes spawn, makes it a callback

* Lowercase states

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-08 22:48:54 +01:00
E-MonaRhg
526187fc7b Merge remote-tracking branch 'upstream/master' into gamma_armory_buff_v2 2021-07-08 23:43:41 +02:00
SteelSlayer
7c505d93d9 Fixes a couple things related to miner borg upgrades and kinetic accelerator modkits (#16306)
* miner borg upgrade fix

* re-add check
2021-07-05 19:18:20 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
Qwertytoforty
810a94e48b Prevents every gun under the sun from lying about alt skins (#16205) 2021-06-18 21:14:33 +01:00
Pidgey
f28e20af21 Anyone can now use the finger gun and fake finger gun spells. (#15941) 2021-06-17 10:40:35 +01:00
SabreML
4960f5440c Various Tweaks & Fixes (#15857)
* Stuff

* Grammar reviewer review

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-05-24 16:29:07 +01:00
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
michaelyesok
042d63c897 mochi suggestion
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-23 17:44:06 +02:00
michaelyesok
9c6fed0f3b blue gun yes 2021-05-23 17:27:58 +02:00
S34N
ae6f6148c2 Solgov tweaks (#15896)
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
2021-05-16 11:38:16 +01:00
Fox McCloud
d13b407646 Merge pull request #15885 from S34NW/tginhands
Ports /TG/ shotgun inhand sprites, adds custom ones
2021-05-15 10:47:01 -04:00
Stokes52
8c20b0aef2 Adds new security laser sprites and flavor examine descriptions (#15871)
* Add new security laser and energy gun sprites with flavorful descriptions

* Fix the tesla revolver ammo sprite while I'm here

* Change 1s and 0s to TRUE and FALSE

* fix flashlight x offset and remove unused ammo offset

* remove green flashing lights

* remove green flashing lights from hand sprites
2021-05-04 21:39:54 -04:00
S34NW
86b7f81701 bye-bye sticks, come with me if you want to live 2021-04-13 20:56:18 +01:00
Sean Williams
c0d07bb627 shotguns now go off in your face upon sawing (#15772) 2021-03-30 16:15:47 +01:00