Commit Graph

2450 Commits

Author SHA1 Message Date
Skrem_7
686a2d55ba Stechkin Ammo Buffs (#14524)
* the age of gun is now

* updates incind magazine purchase description
2022-07-09 12:49:00 +01:00
Skrem_7
fbc11cd9d8 Adds unique sprites for Hotshot and Iceblox (#14703)
* whewie fancy bullet time

* Update ammo.dmi
2022-07-08 16:45:31 -05:00
Skrem_7
d040113ce7 Nerfs .38 experimental (#14651)
* Update ammo_boxes.dm

* Update revolver.dm
2022-07-01 23:55:40 +01:00
Redmoogle
23f4fcac71 Buffs the plasma shotgun some (#14649)
* Rebalance

* More Spicy

* Revert "More Spicy"

This reverts commit a11dd90680.
2022-07-01 23:54:45 +01:00
Manatee
a77ad73ef4 Two new ammo types for traitors/nukies(?) (#14563)
* most stuff except sprites

* Sprites for unique shell, non unique drums
2022-06-26 14:27:54 +01:00
Manatee
73e7609ecc Nukies Minigun is now more... Minigun-like (#14446)
* BRRRRRRRRT

* Update code/modules/projectiles/guns/ballistic/minigun.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/guns/ballistic/minigun.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/guns/ballistic/minigun.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/guns/ballistic/minigun.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/modules/projectiles/guns/ballistic/minigun.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update minigun.dm

* nerfs fun

* spread reduction

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
2022-06-26 12:48:19 +01:00
Manatee
e27b75dcee Makes WT mags not be invisible anymore (#14529) 2022-06-21 23:18:20 +01:00
TheRyeGuyWhoWillNowDie
144fe9ba41 buffs the bulldog shotgun because it kind of stinks (#14475)
* Update shotgun.dm

* Update shotgun.dm

* Update shotgun.dm
2022-06-21 22:40:48 +01:00
Vaelophis Nyx
260b3f85a2 nerf DU slugs, but make them cheaper (#14473)
* nerf DU slugs, but make them cheaper

2 less uranium sheets each, AP under 100 but still absurdly high, lower damage to go with them being slightly less expensive

* bump damage back up a little

* tweak values on cost and damage

* Update shotgun.dm
2022-06-21 22:33:18 +01:00
Skrem_7
465bf7b44f WT Tweak/Buff (#14440)
* gun go pew pew = fun

* 22 is symmetrical

* Update code/modules/projectiles/guns/ballistic/automatic.dm

Co-authored-by: Theos <theubernyan@gmail.com>
2022-06-19 10:13:36 +00:00
Skrem_7
16b23cf1d1 Slight arrow tweaks (#14431) 2022-06-19 11:02:14 +01:00
Theos
641086a996 you can now shoot over people who are near you if they are resting (#14461)
* you can now shoot over people who are near you

* Update projectile.dm

* Update projectile.dm
2022-06-19 04:51:21 -05:00
Skrem_7
c7ddce7b70 rubber shot better? (#14438) 2022-06-18 09:00:26 -04:00
nmajask
8d5235713c Bones, Bows, and Bamboo - Ports "Tribal crafting expansion", "Adds bamboo walls, stools, benches, recolours and resprites existing bamboo items" and other assorted Bee PRs [IDB IGNORE] (#13634)
* Add files via upload

* changed sigtech, tourist, and clerk icons

added more detail to sigtech icon
new tourist and clerk icons

* Some more icon changes

I uploaded the wrong file

* applied grimm-hollowknight requested changes

Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight

* ah, so thats why you reverted that change

im dumb

* why cant i merge upstream

why github

* Adds brig physicians

Adds brig physicians as a new job. There are a lot of changes, but in short:
- Added the job and many required things for it to work
- Edited maps to add lockers, landmarks, and update the brig medbay
- Added new clothing, PDAs, IDs, ect.

* Fixed some stuff

- Fixed some stuff I forget to change on some maps
- Added new landmark icons

* Removed Brig Physician's ability to be an antag

Removed Brig Physician's ability to be antag and gave them a mindshield

* Many requested changes

- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in #11744

* Another bunch of changes

- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for #11744 now that its merged
- Fixed a merge conflict

* Might fix one of the merge conflicts

ahhhhhhhhhhhhhhh
I had to redo ALL of the map changes, so that was fun

* Should finally bring this back to a functional state

Should fix some of the checks failing cause the Kilo file was messed up
- Re-did the changes to Kilo
- Fixed something I left in while testing stuff

* Thought I fixed this

- Fixes the Brig Physician's skill capes using the wrong job

* Should fix wejengin2's issues with the maps

Should fix most of wejengin2's issues with the map changes.
- Changes all the emergency wall meds to normal wall meds
- Might have fixed the APCs, but I don't know if I did it right
- MapMerged Kilo
- In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary
- In Box, I re-added some of the missing items
- In Delta, rearranged the lights and replaced them with tubes
- In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary

* Bows, bamboo, and bones

Ports the stuff

* Before i get yelled at

* ack

* Some sprites I forgot to save

* Syndicate bow

* Map changes

* Other bee ports

This might be a bit too much to add

* Fixes invisible bows in Fastdmm2 and a build error

* oops

* Some tweeks/fixes

* More stuff

Added more footwraps, ported tribal skirts, and fixed hardlight bows

* merg

* oops

* aaa

* Gramger

Thanks Anvilman

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Revert "Merge branch 'yogstation13-master' into tribal-crafting-port"

This reverts commit b0396f5085, reversing
changes made to 3085d93160.

* Revert "Merge branch 'tribal-crafting-port' of https://github.com/nmajask/Yogstation-But-Worse into tribal-crafting-port"

This reverts commit 32967243c7, reversing
changes made to b0396f5085.

* Fix

* More fix

* removes some stuff

for now

* fixed dart guns

* Embed stuff

pain

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Theos <theubernyan@gmail.com>

* ADMIN LOG: A

* fixes

* pain

* less debug

* Readd the changes

* balance

* hardlight bow stuff

* bamboo

* starting recipes and stuff

* More clothes

Ports some stuff

* Adds the clothing to the map

* balance

* Slug fix

* MELEE!

* Crossbows

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Update code/modules/projectiles/projectile/reusable/arrow.dm

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Hardlight bow arrow embedding

* Ashwalker nest tweaks

* Balance

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Bow fixes and minor balance changes

* Im dum

* fix

* Update code/modules/projectiles/boxes_magazines/_box_magazine.dm

* reorganized crafting menu

aaaaaa

* huh

* fex

* removed broken code

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-06-11 14:58:17 +01:00
nmajask
efb926aa46 Syringe guns now embed syringes (#14192)
* Squashed commit of the following:

commit 8ec2fca541
Author: nmajask <nmajask@gmail.com>
Date:   Thu May 19 15:26:09 2022 -0400

    Converts embedding into a proc

    also adds a embed tic proc that is called whenever the embedde has a life tick

* Syringe gun rework

Syringe gun now embeds syringes and slowly transfers the reagents

* Squashed commit of the following:

commit c6d04d476b
Author: nmajask <nmajask@gmail.com>
Date:   Sat May 21 16:12:51 2022 -0400

    b

commit da83fdc5a0
Author: nmajask <nmajask@gmail.com>
Date:   Sat May 21 15:47:52 2022 -0400

    a

commit 8ec2fca541
Author: nmajask <nmajask@gmail.com>
Date:   Thu May 19 15:26:09 2022 -0400

    Converts embedding into a proc

    also adds a embed tic proc that is called whenever the embedde has a life tick

* a

* Pain

* Fixes and Buff

* buff

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-06-11 14:54:43 +01:00
TheRyeGuyWhoWillNowDie
ec12eec4c8 Update automatic.dm (#14254) 2022-06-11 14:43:27 +01:00
Byemoh
c05cb71730 Mining Rework 1.5 - Okay now lets blow things up! (#14173)
* moves stuff + upgrade parts

* yes

* Update world_anvil.dm

* removes world anvil

* world anvil

* simplifies world anvil code

* Update world_anvil.dm

* blasma shotgun

* bruv

* Update layout.dm

* Update machine_vending.dm

* Update machine_vending.dm

* Apply suggestions from code review

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update upgrades.dm

* Apply suggestions from code review

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update miningbase.dmm

* whoops

* Update upgrades.dm

* Update world_anvil.dm

* Update world_anvil.dm

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-06-11 13:50:12 +01:00
TheRyeGuyWhoWillNowDie
f056cee817 Adds Clownshot (#14300)
* Update shotgun.dm

* Update shotgun.dm

* Update shotgun.dm

* Update shotgun.dm

* Update all_nodes.dm

* Update misc_designs.dm

* fix
2022-06-04 16:16:15 +01:00
cuackles
f541289656 new makeshift weapon, removed makeshift laser rifle (#14081)
* Update projectile.dmi

* Update launchers.dm

* hehehe

* bolts and stuff

* adds the fancy

* Update launchers.dm

* yea

* Update rocket.dm

* ssssssssss

* stuff

* Update launchers.dm

* aaaaaaaaaaaaa

* Update rocket.dm

* mhm

* begone

* Update rocket.dm

* Update ammo.dmi

* aaaaaaaaaaaaaaamhm
2022-06-02 12:21:55 +01:00
tattax
c278cf30cf moves atom/target in do_after() forward (#14161)
* wowzers

* s2

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>

* s3

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-05-30 21:25:59 +01:00
ynot01
a94aa9a6f4 round actually ends on narsie & time defines (#14207)
* round actually ends on narsie

* time defines

* time defines
2022-05-28 22:56:57 +01:00
00ze-cyclone
2fd77141a6 Update temperature.dm (#14212) 2022-05-28 16:50:53 +01:00
Manatee
f1fa921f15 Adds two new ammo types, and crafting recipes (#14097)
* Changes "APC Module" to "Power Control Module" for consitency

* fixes a fuckup

* Adds two new ammo types, and crafting recepies

* Makes the round hit mechs and penetrate people (probably)

* Gives each shell its own sprite, adds a sprite for a fired u shell.

* Removes incorrect documentation

* Fixes the one pixel that was there for some reason

* idk does something but it doesnt work still so idk.

* New sprite from orca

* Makes the penetration actually work. Thanks Bibby

* makes the ammo not op as fuck like when i was testing

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Changes from the man of anvil

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Changes from the man of anvil

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

Changes from the man of anvil

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Avnil used the wrong slash like an IDIOT

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

i cant spell

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Update code/modules/projectiles/ammunition/ballistic/shotgun.dm

removes a single space.

Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>

* Fixes my own merge conflict

* Revert "Fixes my own merge conflict"

This reverts commit 710ec071f6.

* hopefully fixes merge conflits

* Update ammo.dmi

Co-authored-by: Manatee <74586965+Ptohms@users.noreply.github.com>
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
2022-05-16 21:50:11 +01:00
Manatee
f3faae0b20 Adds a new technical ammo type, Thundershot (#14074)
* Adds funny thunder ammo

* Makes it not suck, and not literally oneshot everyone

* Makes the ammo craftable

* removed a tab because byond was getting pissy
2022-05-16 20:25:58 +01:00
tattax
7cc7105157 damage flags are now defined from tg (#14050)
* 1st

* s

* d

Co-authored-by: Theos <theubernyan@gmail.com>
2022-05-16 20:14:12 +01:00
Marmio64
b56499b103 buffs unused spells and makes note of the weaknesses of tesla blast and lightning bolt (#14035) 2022-05-10 18:51:59 -04:00
Manatee
55881fb495 Changes laser slug to laser buckshot (#14073)
* Changes laser slug to laser buckshot

* (almost) Halves damage, and adds custom laser type

* Reduces damage further down to 10 per laser
2022-05-10 23:18:54 +01:00
Trustback
597c1562f7 The miniguns now have proper overheating warnings + heat sensors (#14046)
* Timetotestgun

aaaa

* Examine heat

* fixed examine

* Now applies to all miniguns
2022-05-10 23:03:36 +01:00
cuackles
74b1ffc007 3,2,1 let's jam (#14047)
* gun goes click

* Update shotgun.dm
2022-05-10 16:52:28 +02:00
nmajask
f664f6bab8 Adds more makeshift items (#13374)
* Adds more makeshift items

Adds more makeshift tools and weapons

* Forgot the important stuff

Now it should be locked behind syndicate crafting

* horror files and fixes

fun

* merge conflict

* ack

* Fixes, cleanup, and tape gags

aaaaaaa

* pain

* Update mask.dmi

* Update code/game/objects/items/kitchen.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/game/objects/items/devices/multitool.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* Update code/game/objects/items/devices/multitool.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
2022-04-30 14:05:59 +01:00
Theos
5aab6b00cf gives the saw automatic fire mode (#13895) 2022-04-25 23:30:27 +01:00
Theos
30ac0c6c5f Rebalances the security ebow (#13876)
* rebalances the large ebow part 1

* ebow part 2

* specialist weapon

* specialist weapon

* why is this huge not large wtf

* ebow no longer holds charge when dropped

* no unique frequency
2022-04-25 22:59:14 +01:00
Theos
04c60e57e7 fixes KA explosion (#13738) 2022-04-16 16:34:11 -05:00
Chubbygummibear
41969d6f59 Fix handcannon not being reloadable and makes the reload text cooler (#13716)
* recannon

* cooler mechanics wording
2022-04-13 05:41:51 -05:00
Theos
d399f73f91 Increases death syphon modkit's damage per kill from 1.25 to 5 and the megafauna bonus mod from 4 to 5 (#13648) 2022-04-10 14:16:02 +01:00
00ze-cyclone
c3a9fd8faa Make the X-01 multiphase energy gun use a regular powercell and have a regular energy consumption (#13641)
* Normal powercell and energy consumption

* remove HoS laser

* Remove HoS disabler shot

* Slightly reduce Ion HoS cost

It's still 4 shot only and still consuming more energy than the ion rifle.

* Bye HoS cell
2022-04-10 13:39:46 +01:00
Theos
5709300461 makes the rapid repeater modkit not break (#13649) 2022-04-09 18:37:37 -05:00
LazennG
a4b392f936 new item for pirates: hand cannon (#13511)
* New tator item: Air Shoes

New 'air shoes'
-intended tot item for 4-5tc
-functionally wheelys that can ollie as well
-slight maneuverability in 0g just like moths

Co-Authored-By: Byemoh <5091394+ToasterBiome@users.noreply.github.com>

* things changed

-tried giving them the ability to ollie but botched it and idk how
-nvm baiomu told me

* Update scooter.dm

sparks appear on activation of shoes

* making it so if atmos is ok and gravity is gone yo can still move

* LAST THING DIDNT WORK

trying tje walk in pressurized thing again

* what do you MEAN UNDEFINED VAR

* stole from mothcode again instead

fuckin indentationerrors

* Update miscellaneous.dm

* fuck it dealing with this part later

* SPRITES BABEY

airshoes have proper worn/item sprites now

* changing shoe toggle sprites

toggling them on has its own sprite, but working on getting the ollie one to work properly

* Update shoes.dmi

* another shot at the movement in 0g

second attempt at allowing movement in 0g and atmos

* headache part 4

* Update miscellaneous.dm

* messed up vehicle sprites

added in icons for riding but sprites are a bit buggy atm, will replace later when replacements come in

* trying to figure out why a button wont change

* got it

no longer skateboard ollie

* just had a worse idea

gonna replace noslip with something else

* yes its dashing

* jorts

* jorts 2

* vehicle sprite

* last sprite thing

added custom sprite for shoe dash

* shoes can be renamed now

* Update miscellaneous.dm

* other actions now available+fixed sprite mistake

-removed a redundant line stopping the action from being recognized
-removed old shoe vehicle sprites so there's no shoes on top of shoes

* adds shoes to uplink and changes dash name

-alphabetically added to misc gadgets section
-name of dash changed from 'activate air shoes' so its less confusing

* Update miscellaneous.dm

* fixed a problem

walking while dashing used to just interrupt the dash so i just made the dash happen faster

* basic functions of hand cannon

* what do you mean cannonballs arent ninja stars

* cant have shit (pneumatic cannon) on yog so making it a gun

* changed cannon noise and am figuring out projectile knockback give me a minute

* knockback works now and cannonballs no longer tiny

* puts cannonballs and handcannon in pirate ship

* gets rid of extra rows

* what the fuck is a meter

* i cant even see if these work since my server wont start up

hoping they do tho

* why does this keep happening

Co-authored-by: Byemoh <5091394+ToasterBiome@users.noreply.github.com>
Co-authored-by: ToasterBiome <baiomurang@gmail.com>
2022-04-02 23:58:20 +01:00
ynot01
0ba037852c fixes uberspam for inf uber (#13557) 2022-03-31 21:08:01 -05:00
Byemoh
c964e3a335 Lavaland Mining Rework #1: What do you mean I have to mine?? (#13185)
* mining ayyy

* default power is 1 + fix plasma cutter

* mining charges + hardness changes + lightens icon

* admins

* Update minerals.dm

* Update minerals.dm

* Update minerals.dm

* Update mining_charges.dm

* Update minerals.dm

* upgrades

* fixes bugs

* Update world_anvil.dm

* ow

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

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

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

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

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

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

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

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

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

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/mining/equipment/mining_charges.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* fixes stuff

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

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* bad cowbot

* fixingg buggsss

* Update kinetic_accelerator.dm

* new spritz

* no free c4

* Update energy.dmi

* Update mining_charges.dm

* Update resonator.dm

* Update resonator.dm

* inhands

* adv plasmacutter inhand sure

* Update world_anvil.dm

* no ghosts

* Update minerals.dm

* yeah this is probably fine

* Update mining_charges.dm

* Update mining_charges.dm

* Update mining_charges.dm

* Update mining_charges.dm

* Update world_anvil.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-03-27 12:36:20 +01:00
nmajask
fc5b71cf84 Pacifists that order stechkins from an uplink get a version loaded with soporific rounds (#13404)
* Pacifist stechkin

Gives pacifists who order stechkins from uplinks get a version loaded with soporific rounds.

* Alerts the user

Alerts the user of the change of ammunition

* Merge branch 'sleepy-round-stuff' of https://github.com/nmajask/Yogstation-But-Worse into sleepy-round-stuff

* Reworks the implementation

Makes starting mag a variable and changes the check to look for pacifism being a quirk.

* Update code/modules/uplink/uplink_items.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-03-13 17:45:52 -05:00
Byemoh
33d82a3117 Update gun.dm (#13394) 2022-03-09 18:00:43 -06:00
ChesterTheCheesy
4d369ae1db Eldritch horror - the final PR (#13033)
* Update is_helpers.dm

* Update role_preferences.dm

* Update traits.dm

* Update names.dm

* Update traumas.dm

* Update miscellaneous.dm

* Update scanners.dm

* Update sql_ban_system.dm

* Add files via upload

* Update headcrab.dm

* Update panacea.dm

* Create e

* Delete e

* adds horror

* Add files via upload

* Update suicide.dm

* Add files via upload

* Update brain_item.dm

* Update death.dm

* Update human.dm

* Update transform_procs.dm

* Update gun.dm

* Update organ_manipulation.dm

* Update uplink_items.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Create horror.txt

* Add files via upload

* Update yogstation.dme

* adds horror-relatated tips

* fixes a typo

* Update code/_onclick/hud/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update scanners.dm

* Update code/modules/antagonists/changeling/powers/headcrab.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* i hope this won't break again

* actually makes horror unable to force lings to suicide

* fixes duplicate definition

* Not needed, changeling code already checks for that

* Cleans up a lot of code

* thank you theos for absolutely nerfing the crap out of horror tentacle

* cleans up a lot of bibby's suggestions and fixes a few bugs

* not sure if i changed anything in this file, but fuck it

* lets fix that merge conflict

* i sure hope github doesn't go nuclear

* oops made horror unable to work

* i hate logic gates

* sorry for commit spam but this thing literally broke horror and i wanna fix it as soon as possibles

* HAHA STUPID DE MORGAN! (tested works as intended)

* abominations summoned by curator horn should not attack horror anymore

* adds missing "

* cannot use lube ability whilst dead anymore

* Update horror_abilities_and_upgrades.dm

* flailing lube stops when you're killed while doing it

* fixes ordering so you can't get stuck in wrong animation at the last spin

* Horror can no longer squeeze through welded airlocks

* Infesting people is now assigned to Alt+Click

* makes tentacle arm no longer affected by range multipliers

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-02-02 18:44:08 +00:00
Mqiib
a7da6636c4 More dakka (#13046)
Same dablage
2022-01-12 17:45:14 +00:00
Marmio64
2698cf510c slightly buffs wizard spellblade and nerfs mining spellblade [alternative to #12994] (#12995)
* slightly buffs wizard spellblade and slightly nerfs mining spellblade

spellblade's projectile has damage increased to 20 instead of 15. Weak spellblade keeps the normal 15 damage projectiles and has it's dismemberment ability lowered from 50(%?) to 35.

* Update magic.dm

additional lowering
2022-01-12 17:38:40 +00:00
Notamaniac
ad109773fc SINGLE SHOT BURST (#12970)
* Updates wt550 description

* Update automatic.dm

it
2021-12-26 12:23:43 +00:00
UselessTheremin
54464df533 Fancier Throws and Bullet Ejection (#12789)
* fixes that shit

* Revert "fixes that shit"

This reverts commit 8e6b495fa4.

* Update items.dm

* Update glass.dm

* Update drinks.dm

* Update drinks.dm

* Update bottle.dm

* Update inventory.dm

* Update _ammunition.dm

* Update reagent_containers.dm

* Update bottle.dm
2021-12-11 16:12:53 +00:00
ynot01
11dc9038c6 makes dragnet comparable to a shotgun (#12675) 2021-11-18 20:03:48 +01:00
Theos
c2df3712a0 Revert "Revert "Remoevs the L6's burst fire since its effective long range dps is higher than the sniper (#12498)" (#12543)" (#12544)
This reverts commit 4dea0cd07d.
2021-10-31 13:22:22 +00:00
Theos
4dea0cd07d Revert "Remoevs the L6's burst fire since its effective long range dps is higher than the sniper (#12498)" (#12543)
This reverts commit 3f7915f865.
2021-10-26 23:04:50 -04:00