Commit Graph

1568 Commits

Author SHA1 Message Date
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
roarbark
8156f4b13a code looks uniform now. praying to god that people dont get emails for this. 2021-09-18 02:01:33 +02:00
roarbark
9a290b4e7a whoops, the 9mm armourpiercing is now back to 10 AP 2021-09-18 01:51:06 +02:00
roarbark
69fd8f9b9a Revert "Revert "new subtype, changed values""
This reverts commit bf150bdfac.
2021-09-18 01:46:57 +02:00
roarbark
bf150bdfac Revert "new subtype, changed values"
This reverts commit ae99d900e7.
2021-09-18 01:25:39 +02:00
roarbark
ae99d900e7 new subtype, changed values 2021-09-18 01:17:58 +02:00
roarbark
0774ec2867 buffs wt550 ap
this increases the armour piercing ammo that the autorifle gets from 10 ap to 30 ap
2021-09-12 23:56:51 +02:00
variableundefined
6c085cf23b Merge pull request #16064 from michaelyesok/foampistol
Foam enforcer tweaks
2021-09-11 19:12:07 -05:00
variableundefined
7cffabf93c Merge pull request #16422 from Qwertytoforty/too-hot-to-handle
Immolator lasers now immolate all mobs
2021-09-11 13:22:02 -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
AffectedArc07
70fd70f2eb Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-09-02 14:01:27 +01: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
AffectedArc07
4062bc6b1a Merge branch 'master' into client-data-loading 2021-08-29 20:56:41 +01: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
1465a7de14 magic damage flag 2021-08-20 22:18:26 +02: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
AffectedArc07
f73af8b3cf Refactors client data loading 2021-07-29 12:52:45 +01: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
Qwertytoforty
1f9375f37a fixes it 2021-07-25 10:00:08 -04:00
Qwertytoforty
d7ae75ae95 isliving on the edge
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-25 09:43:25 -04:00
Qwertytoforty
a22c1e0de3 Immolator lasers now immolate all mobs 2021-07-25 08:57:41 -04:00
SteelSlayer
dab535ef16 cyborg laser fix (#16399) 2021-07-20 08:18:28 +00:00
hal9000PR
3eb3bdcdc7 indestructable walls (#16362) 2021-07-14 15:01:28 +01: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
Fox McCloud
d9d09deb00 Merge pull request #16212 from AffectedArc07/atom-rotation
Better atom rotation
2021-07-01 22:15:58 -04:00
AffectedArc07
9b86a42a3d Casing 2021-06-24 17:29:18 +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