Commit Graph

2304 Commits

Author SHA1 Message Date
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
Theos
3f7915f865 Remoevs the L6's burst fire since its effective long range dps is higher than the sniper (#12498) 2021-10-24 15:46:23 +01:00
KillerOrcaCora
fe7650f304 Osprey description update! (#12335)
* Update uplink_items.dm

* Update minigun.dm

* Update uplink_items.dm

* Update uplink_items.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-10-24 15:04:17 +01:00
Mqiib
2e2f4fe7b1 Boolets (#12301) 2021-10-24 15:03:04 +01:00
Redmoogle
1074be5011 Cleans up some do_after calls (#12417)
* Replaces do_after delays with defines instead of deciseconds

* Fixes Text
2021-10-09 01:18:35 -04:00
Theos
0c4f4547f5 Adds sleepy rounds for the 10mm pistol, this is totally not going to be either blatantly over or underpowered lmao (#12368) 2021-09-28 03:30:45 -04:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
grimm-hollowknight
70ec39c97c Gives the syndicate firing pin an unique description. (#12249)
* Update pins.dm

* typo

Co-authored-by: Idinuum <37936685+Idinuum@users.noreply.github.com>
2021-09-06 12:43:52 +01:00
Jamie D
9d97a0ba08 Makes cheese effect temporary, also change back on cheese mob death (#12098)
* SHOULD WORK

* Update code/modules/mob/living/simple_animal/friendly/cheese.dm
2021-08-26 00:47:35 +01:00
JC Denthead
77012a9548 Adds that gun Caspian was asking me to for weeks. (#11722) 2021-07-18 13:45:34 +01:00
Theos
1c667e9111 Mosins are no longer able to be fired while holding stuff in the offhand BUT are back to 60 damage (#11728)
* cryimg

* yes and
2021-07-07 11:50:04 +01:00
TheGamerdk
8731a27148 Update gun.dm (#11686) 2021-07-03 23:24:30 -04:00
Jamie D
75a8ab5443 Parmesan (#11588) 2021-06-13 15:22:27 +01:00
missatessatessy
b8b7618948 Cheese Staff 2 Electric Booglaloo (#11524)
* Redefines cheese staff proj

* Pick it up!
2021-06-12 12:59:01 -04:00
UselessTheremin
7fa75d2a53 THE SPELLCHECKENING (#11483)
* fixes that shit

* Revert "fixes that shit"

This reverts commit 8e6b495fa4.

* Update marrow_weaver.dm

* Update tools.dm

* Update alcohol_reagents.dm

* Update _misc.dm

* Update miscellaneous.dm

* Update staff.dm

* Update drinks.dm

* Update spellbook.dm

* oops!
2021-05-16 07:03:36 -04:00
Theos
cf43e544be fixed application of #11322 whoops 2021-05-12 03:39:17 -04:00
ChesterTheCheesy
0ed3980500 Polysmorps bleed green blood like xenos do, and species without blood don't bleed red (#11292)
* Update blood.dm

* Update living.dm

* Update projectile.dm

* Update miscellaneous.dm

* Update atoms.dm

* Add files via upload
2021-04-25 11:22:36 +01:00
Theos
7dbd09e2ac remove burst fire from WT rifle (#11322) 2021-04-24 16:11:40 -04:00
alexkar598
1ea5360a5d Revert "makes science's greytide gun unobtainable" and makes it not pass tables or windows (#11260)
* Revert "makes science's greytide gun unobtainable (#11029)"

This reverts commit 42d5cdc68f.

* no glass no table

* Changes and stuff and shit and things

* Lol I forgot to save
2021-04-10 07:26:55 -04:00
alao3alao3
d3e97df283 even theos and ynot see valuechanging as beneath them smh (#11230) 2021-03-27 16:01:14 +00:00
Theos
5cd49bdd8a Syndicate lavaland syndie snipers are no longer usable by crew (#11169)
* lol

* ultrasecure sniper rifle

* Update automatic.dm

* Update automatic.dm

* dont think this stuff just doesnt get noticed

* Update automatic.dm

* ultrafucked

* Update pins.dm

* fix runtime
2021-03-20 13:09:19 +00:00
TheGamerdk
df61c9900a Hulk Rework 2021 Edition [BOUNTY] [Old-Yogs] (#10902)
* initial commit

* Finished

* HULK SMASH THOSE COMMAS

* HULK BRAIN HURTY

* HULK SMASH BUGS

* HULK NOT DUMB SHUTUP

* SMASHY

* Update hulk.dm

* Update code/modules/mob/living/carbon/carbon_defense.dm

* Update code/datums/mutations/hulk.dm

* Update life.dm

* Update code/datums/mutations/hulk.dm

Co-authored-by: AsV9 <andreaslv99@hotmail.com>
2021-03-17 22:29:19 -04:00
Redmoogle
6927a8dc42 Add a mining(plasma) shotgun for 6,000 points with a gibtonite defuser for 1,000 (#11000)
* Add the plasma shotgun

10k points for the gun
5k for the autodefuser

* Lower Values

10,000 -> 6,000
5,000 -> 1,000

* cleanup & fix

* cleanup
2021-03-12 09:13:56 +00:00
Theos
553b8542a1 reduces the damage of shotgun slugs to 46 down from 60 (#11039) 2021-02-24 18:41:11 +00:00
ynot01
0f3f1e5f26 Ubercharge (#10875)
* IM FULLY CHARGED

* why is this caps locked

* indentation

* needs to call parent apparently?

* Update code/modules/projectiles/guns/misc/medbeam.dm

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

* Update medbeam.dm

* Update medbeam.dm

* delta time & action fix?

* typo

* buggy spelling

* appropriate removal of godmode

* .status_flags

* bit operators

* ~

* uber overlay

* funnier desc

* shitcode indicator

* poke

* Update medbeam.dm

* )

* not shitcode

Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* caps

* round

* name fluff

* uplink

* advertisement

* prevent uber flashing

* patch exploit

* turn off if uber flash

* comments and autodocs maybe

* no uber flashing to save uber

* fix flash detection

* clean up

* stolen from timestop

* 40-80 seconds for uber charge

* push

* unpush

* poke merge conflict

* godmode tell

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2021-02-13 16:18:07 +00:00
Theos
069b1df4b6 makes mosins medium size (#10953)
* makes mosins medium size

* obrez can be dual fired but it's terrible so
2021-02-06 10:28:16 +00:00
TheGamerdk
925d4ac315 Update foam_dart.dm (#10901)
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2021-01-18 15:29:56 -05:00
Redmoogle
cb8d5a892a Adds a new bullet component PENETRATE (#10865)
* Add a new BULLET_ACT component

* Better name
2021-01-14 13:19:15 -05:00
Marmio64
86e5334446 stuff (#10582) 2020-12-12 14:34:41 +00:00
Theos
59f22a9f39 Update automatic.dm (#10595) 2020-12-06 14:41:40 +00:00
Gary Lafortune
601271de6b Fixes Anti-magic sometimes not working, fixes Runic Bombs double-exploding sometimes (#10577)
* Makes anti_magic_check mostly a /mob/living proc instead of /mob/

* (big and scary) Revamps how magic projectiles deal with antimagic

Previously, every singular ../projectile/magic had an onhit override that did the same 5-ish lines of code. No more!

As well, all of it is now handled in prehit instead of on_hit, which should fix some issues regarding spells ignoring antimagic.

* Fixes Runic Bombs detonating twice when targetting carbons

AFAIK this halves the damage of this spell. Kind of a game balance decision whether to preserve the bugged double-damage or not.

* Fixes compiletime in living.dm and warning in magic.dm
2020-12-04 16:46:02 -05:00
Theos
ecd1d3474c someone stop this theos guy (#10515) 2020-11-27 22:15:27 +00:00
Hopekz
e875dd43be Occupying force ERT (#10326)
* Occupying force redone V2

* Airlock Jimmy

* Jimmy rework part 2

* Airlock J conversion

* Helm light fix and more jimmy changes

* casual jumpsuit fix, helm light

* jumpsuit fix. balancing

* indent fix

* Energy bolas

* flows better

* whoop

* Forced to run parent

* Cigarettes start lit

* Needs to initialize first otherwise properties won't update except the icon

* Riot officer gets earmuffs per Fluffe's suggestion

He's straight edge now

* Tabs instead of spaces
2020-11-19 21:25:00 +00:00
Jamie D
98508e8302 Runechat 1.1 - TG Edition (#10318)
* RUNECHAT UPDATES

* Fixes hologram speech hopefully.

* Update ai.dm
2020-11-04 18:28:54 +00:00
Marmio64
c8f358d1f7 fucking bood (#10198) 2020-10-29 12:08:04 +00:00
Jamie D
0dd6fae119 [Port] Explosions Subsystem Test 1 (#10202)
* Explosions Subsystem Test 1

* Fucking linter

* Fucking TG Are Dents

* SCREW OFF LINTER
2020-10-28 17:54:13 +00:00
Jamie D
10c9af0d77 Material datums - Moogle Helped - Check #10169 for more info (#10176)
* Hmm

* work please

* Fixes

* Ack

* REEE

* EEEE

* e

* e

* e

* STAND FIX

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/game/machinery/autolathe.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-28 17:53:59 +00:00
Marmio64
6fab12c87f buff spellcard damage (#10034) 2020-10-18 22:30:54 +01:00
Gary Lafortune
50d5c49a8e [I Ded] Reduces the charges and recharge rate of the Locker Staff (#10020)
* Reduces the max_charges and recharge rate of the locker staff

* Reduces the recharge rate to one charge per half-second or so
2020-10-18 21:24:55 +01:00
Theos
e74a361df9 Buffs WT rifle AP and adds rubbershot magazines to the WT rifle (#9854)
* de-sissifies the WT rifle magazine names and adds the rubbershot magazine

* Update smg.dm

* add rubber bullet casing

* Update smg.dm

* add rubber bullet projectile

* Update smg.dm

* ammo icon blatantly stolen from unused toxin rounds

* Update weapon_designs.dm

* this is a terrible spot on the techweb for literally anything

* not again

* Update packs.dm

* Update weapon_designs.dm

* Update packs.dm

* increases AP of normal rounds by 20 and AP of AP rounds by 10, rubber rounds still have 0

* Update packs.dm

* Update weapon_designs.dm
2020-10-03 21:13:10 +01:00
Theos
bea6c54f63 WT rifle gets 2 round burst (#9853)
* WT rifle gets 2 round burst

* dont need this
2020-10-03 21:12:42 +01:00
Hopekz
6d43755122 Fixes gun feedback playing when the gun isn't firing. (#9807) 2020-09-27 12:48:16 +01:00
Hopekz
4a4e0bfdb1 Ballistic weapon feedback system (fixed and reuploaded edition) (#9751)
* Reagant viscosity framework

* Revert "Reagant viscosity framework"

This reverts commit d4f9841bd3.

* Fixes camera's + mode feature

* Revert "Fixes camera's + mode feature"

This reverts commit f884130943.

* Amber task force back tanks are non droppable

* Revert "Amber task force back tanks are non droppable"

This reverts commit 6956444f56.

* Ballistic weapon feedback system (Sketchin fully animated as proof of concept)

* Debug messages be gone

* Removes unused sprite

Now only using slide open and close for animations instead of a fire animation

* Adds gun recoil and slide close feedback

* space before jamie gets here

* Forgot to implement feedback_fire_slide

* Merge conflict be gone!
2020-09-24 20:03:36 +01:00
AdamElTablawy
41cfcf7bae nerfs combat shotgun (#9708) 2020-09-24 19:42:04 +01:00
ynot01
5cd753a260 breaching shotgun only fits breaching slugs now (#9758)
* breaching shotgun only fits breaching slugs now

* breaching desc update
2020-09-23 20:34:05 -04:00
Theos
606aa52b23 kinetic accelerator now works with damage multipliers from outside sources (#9493) 2020-09-01 09:27:25 +01:00