Commit Graph

1165 Commits

Author SHA1 Message Date
William Wallace
45f2feda3b replace extra icon_state with item_state in /obj/item/gun/ballistic/rifle 2019-10-09 00:15:41 +01:00
William Wallace
076e532e65 remove duplicate var definitions in /obj/item/gun/magic 2019-10-09 00:13:11 +01:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
nemvar
a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
Firecage
3996aaa197 Lets Syndi Mediborgs and Syndi Engiborgs get some of the upgrades of normal Mediborgs and Engiborgs. (#46760) 2019-10-03 02:17:17 -07:00
81Denton
8cfe0b3ccf Soul stone tweaks (#46765)
* Soul stone tweaks

* h

* fuck
2019-09-30 14:27:55 -04:00
spookydonut
210ba5c571 Adds linting for equipped() pickup() dropped() (#46614)
* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review
2019-09-25 02:31:29 -07:00
Rob Bailey
7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
ArcaneMusic
1e97c21bfb Fixes the Advanced Plasmacutter Inhand (#46528)
* Fixes the Advanced Plasmacutter Inhand

* 4th try now

* No wait I like datums please dont
2019-09-16 01:53:32 -04:00
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
carlarctg
8f34bf11aa Adds inhand improvised shotgun sprites (#45995)
* the poke

* e

* wrong bracnch

* improvised spripes

* better spropes

* hoook time

* hooky

* h

* fuckkkk

* "fix"

* fuggggggggggggggg

* shit wrong pr

* fixes

* no e

* un-hooked

* more unhookinga

* added unused twohanded sprites

* Revert "Merge branch 'master' into shotgun"

This reverts commit 95caaf6270cebdc21b80659a6a0725bf37c005d1, reversing
changes made to 3cec8e8f3b188a15a495adb61f724cedd7d35246.

* Revert "Revert "Merge branch 'master' into shotgun""

This reverts commit 6677b4718f22f99befe4e9718b9b7c1f02ea6311.

* Revert "Revert "Revert "Merge branch 'master' into shotgun"""

This reverts commit 3df1e045861bb3abcebaa5b900648b016c53d620.

* Revert "Revert "Revert "Revert "Merge branch 'master' into shotgun""""

This reverts commit 8fc15d61daf40dd2ae557fdefdbd73274540cf01.

* big brain move ahead

* big brain move actuated
2019-08-22 00:23:55 -07:00
nemvar
a5e62c93b0 Fixes bulldog inhands (#45833)
* The bulldog has inhands once more.

* forgot these are a thing
2019-08-11 22:16:29 -07:00
81Denton
7b8579c17a Minor ghost notify changes (#45759) 2019-08-08 01:47:04 -07:00
Rob Bailey
76115373b1 ballistic guns autodoc (#45578)
* ballistic guns autodoc

* fixes
2019-08-03 14:39:51 +12:00
Rob Bailey
8c36cf28a4 Better shotgun inhands (#45521)
About The Pull Request

Someone correctly pointed out to me that the other ones would need a free hand, and two hand component still isn't done yet. Whoever is working on it, get going for zero pay, and do it faster.

Since people did not like how THICC and BEEFY the inhands were as well, I made them a little shorter to make them look less like they're 7 ft long.

image
64xshottygun

This is what they're going to look like now, I'll bring back those two hand ones once the component is done eyes

for combat shotgun, regular shotgun, riot shotgun, and double barrel.
Changelog

cl
imageadd: New shotgun inhands
/cl
2019-08-01 21:19:12 +12:00
Arkatos1
23128c948e Fixes trigger restrictions for magic barrages spells (#45403) 2019-07-24 16:12:03 -07:00
Qustinnus
b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
tralezab
3b49b5378d Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)
* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.
2019-07-22 20:00:34 +02:00
Rob Bailey
440e1b19d2 fixes runtimes related to trash in nullspace (#45160) 2019-07-13 00:42:21 -04:00
cacogen
85ca0d5272 Adds stats to creation/destruction of cleanable decals and trash on station (#44989)
* Adds stat tracking to mess on station

* Checks for maint to make sure stats aren't counting maint trash which is irrelevant to the janitor

* adds mapload arg to init

* asdasd
2019-07-12 14:11:23 -07:00
peoplearestrange
dc41f03501 Changes PKM examine (#44897)
* Changes PKM to use screwdriver to remove modules

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## About The Pull Request
Uses a screwdriver instead of the crowbar(????) to remove modules from it

<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->

## Why It's Good For The Game
Its more intuitive and a lot more consistent with other upgrades and weapons, which use a screwdriver. Also the imagine of using a massive crowbar to pry out a module, whilst funny, isn't really ideal.

<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Changelog
🆑
tweak: PKM now uses screwdriver to remove modules
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->

* Update kinetic_accelerator.dm

* Update kinetic_accelerator.dm

* Update kinetic_accelerator.dm

* Rrrrrreview
2019-07-11 11:58:48 -04:00
ShizCalev
d44535c1f7 Fixes revolvers being spun when they fail to spin (#45092) 2019-07-11 11:42:20 -04:00
nemvar
b337b403d0 Improve sawing off guns, let chainsaws do it too (#44908)
The way guns are sawn off is now more sane. You can now use chainsaws
to saw off guns.

Chainsaws are pretty meaty. They are also made out of the exact item
that is usually used to cut guns. I mostly added this because it felt
weird refactoring this without adding a feature so I can get more
updoots.
2019-07-04 20:45:31 -07:00
kingofkosmos
6e0acf4471 Fix spinning the Russian Revolver (#44904) 2019-07-02 16:49:44 -07:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
Shaps
4f6ee6b7e8 Makes Mosins bulky, lets you saw them into Obrezes [2] (#44791)
About The Pull Request

I was dumb and made the last PR from my master branch instead of a branch branch, see #44774 for past discussion

Makes the Mosin Nagant rifle bulky instead of normal sized, but allows you to saw them off much like your average shotgun to normal size. However, sawing it down will introduce bullet spread because of the drastically reduced barrel.

Why It's Good For The Game

The Mosin Nagant is a really fucking big gun, 48.5 inches in its full length model, and with a bayonet attached it can reach near 6 feet long in total. Item size isn't 1:1 with real life, but considering just how notorious they are for being really big, paying homage to it feels right. Plus, running around with sawed off guns feel much more illegal and thus fun.
Changelog

cl Shaps/Ryll
tweak: Mosin Nagants are now bulky, but can be sawed off to fit in a bag
/cl
2019-06-27 20:28:32 +12:00
kingofkosmos
ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
kingofkosmos
d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
kingofkosmos
fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
nemvar
c1fb454367 arcane (#44716) 2019-06-25 15:30:50 +02:00
XDTM
114628ad7c Fixes antimagic not working in hand slots (#44606)
* Fixes antimagic not working in hand slots

* proper changes

* Update code/modules/mining/lavaland/necropolis_chests.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-06-24 10:31:11 -04:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
wesoda25
67c2434a21 Adds lots of New Items to Syndicate Kits (#44509)
* Update uplink_kits.dm

* fucking stupid man

* Update energy.dm

* Update uplink_kits.dm

* Update special.dm

* Update special.dm

* Update misc.dm

* Update special.dm

* Update misc.dm

* makes hacker better
2019-06-18 23:22:57 -04:00
4dplanner
69bd3810b2 HoS gun ion mode replaces taser mode (#44216)
* HoS gun ion mode

* Bumps up HoS egun ion cost

* Rearranges hos gun ammo types

* Fixes empulse

Adjusts hos ion to weak level
Fixes weak ion bolt
2019-06-11 10:36:17 -04:00
Emmett Gaines
45ec62931d Finally removes the signal redirect component (#44251) 2019-06-09 17:25:50 -04:00
Tlaltecuhtli
dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
Emmett Gaines
c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
ShizCalev
30fd6ddeac Merge pull request #44280 from kingofkosmos/spanendingfixes
Adds missing </span>'s.
2019-06-04 05:50:50 -04:00
Whoneedspacee
03f7432511 New RPGLoot Affixes + Component Additions (#44188)
* knockback component can now be reversed, has projectile and gun handling, and hostile simplemob handling

adds signals for hostile mobs attacking, altering projectiles before firing, and for when projectiles successfully hit their target

moves knockback handling to a general proc

adds ishelpers for guns and projectiles

* no more weird projectile handling it can just not apply the effect if the component somehow goes away

lifesteal actually works now instead of being a blank file, applies a flat healing effect when you hit something

* fixes up comsig stuff

adds new components to the fantasy prefix and suffix

knockback now handles throwing anchored objects

lifesteal now properly heals the target with projectiel weapons

adds summoning component to handle mob summoning with item attacking and such

adds fired_from variable to handle what a projectile was fired_from, firer would be the mob that fired and fired_from would be the gun, in the case of an autoturret, fired_from and firer would be the same

adds shrapnel component, fires projectiles around a fired projectile when it hits

adds igniter component to set attacked mobs on fire

* no more shrapnel on items that can't use it

summoning items now summon at least one mob maximum

adds specific weighted projectile types for shrapnel to prevent broken options being picked

removes the reverse var from knockback component and instead just handles negative thrown turf
2019-06-03 11:00:12 +12:00
kingofkosmos
1bf60bbe06 Adds missing </span>'s. 2019-06-02 21:29:14 +03:00
Akrilla
2d32be1904 Small storage refactor and examine change (#44109)
* Removes repeated line

* Description change for clothing items that can only store specific items

* Get all children of can_hold listed items.

* can_hold only needs the top most item, child items are dealt automatically

* cant_hold related change

* Text change

* Moves the item check to the line above, and removes the current.

* Same changes, but to belt/wallet code.

* Change to using signals instead

* Generic signal on datum/topic

* Cache typecache, and small signal change

* Small argument tweaks and remove unneeded lists

* Change to proc

* Change call can_holds/cant_holds to use new proc

* initial, and cleaned up display code

* Null check
2019-05-30 14:20:29 -04:00
Ghom
17b3091867 Merges tinfoil (hat) protection into the anti_magic component. Implements it on Hivemind gamemode and telepathy. (#43978)
About The Pull Request

Was fairly shocked to find out hiveminds never took tinfoil hat protection in account, so decided to implement the factor in the game mode. Might have overdone it and probably erroneously changed a couple logics while getting rid of some really indented passages that could easily early return.
So what's said on the tin, this is lot more preferable than clunky is_type() checks on headwear anyway.
Also expanded tinfoil protection to hivemind and (non-revenant) telepathy.
Why It's Good For The Game

Let us remember the "purpose" of tinfoil hats.
Changelog

cl
code: Merged tinfoil hat kind of protection into the anti_magic component.
add: Tinfoil hats can also be warped up from excessive dampening of mindray/though control/psicotronic anomalies, or by simply being microwaved in an oven, and become useless.
add: Immortality Talisman and Paranormal Hardsuit helmets now come with tinfoil protection too (minus the paranoia and limited charges).
balance: Rebalanced many hivemind effects to be dampened/delayed by tinfoil shielding. Bruteforced Assimilate Vessel, One mind and Awake Vessel abilities will consume more tinfoil charges compared to others.
balance: Genetics/Slime/Alien Telepathy and Slime Link are now stopped by tinfoil protection.
/cl
2019-05-30 20:29:30 +12:00
vuonojenmustaturska
2219250476 remove /client/mousemove 2019-05-23 22:28:01 +03:00
vuonojenmustaturska
fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
AnturK
e87dc0a919 Adds dueling pistols. (#43489)
* Adds dueling pistols.

* Adds sprites by @MrDoomBringer

* Ok

Co-Authored-By: AnturK <AnturK@users.noreply.github.com>
2019-04-30 11:06:48 -04:00
Rob Bailey
3caaabfd11 [s] Fixes an exploit involving tactical reloading (#43664)
* typo

* better logic
2019-04-23 11:29:58 -04:00
Tad Hardesty
b992620011 Fix runtime when setting up a sec character before atoms initialize (#43527) 2019-04-08 15:54:06 -04:00