Commit Graph

1219 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
ynot01
52c2365f6d THE HONKMOTHER COMES (#9466)
* Revert "Revert "THE HONKMOTHER COMES (#9433)" (#9465)"

This reverts commit 8a28e5d4fb.

* Update code/game/gamemodes/clown_ops/honkmother.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/gamemodes/clown_ops/honkmother.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* Update code/game/gamemodes/clown_ops/honkmother.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>

* ye

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: fluffe9911 <dablank02@hotmail.com>
2020-08-20 16:48:40 -04:00
missatessatessy
17302756c6 Adds Staff of Cheese (#9446)
* Cheese gromit

* It works maybe
2020-08-15 14:25:43 +01:00
alexkar598
8a28e5d4fb Revert "THE HONKMOTHER COMES (#9433)" (#9465)
This reverts commit 5e6b4ab3e8.
2020-08-14 21:30:31 -04:00
ynot01
5e6b4ab3e8 THE HONKMOTHER COMES (#9433)
* floor honk_act

* window honk_act

* table frame honk_act

* table honk_act

* statue honk_act

* falsewall honk_act

* door assembly honk_act

* chair honk_act

* frying pan honk_act

* energy shield honk_act

* airlock honk_act

* wall honk_act

* Update airlock.dm

* Update 288x288.dmi

* SHE COMES

* sprite credit

* Update yogstation.dme

* Update honkmother.dm

* Update honkmother.dm

* Update gun.dm

* defines honk_act

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* actually updates turfs and objs

* actually works

* Update honkmother.dm

* makes layer not fucky

* poke

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update honkmother.dm

* Update fryingpan.dm

* Update staff.dm

* Update mineral_walls.dm

* Update mineral_floor.dm

* Update window.dm

* Update table_frames.dm

* Update tables_racks.dm

* Update statues.dm

* Update false_walls.dm

* Update door_assembly_types.dm

* Update chair.dm

* Update clown_weapons.dm

* clown ops victory spawns her

* Update honkmother.dm
2020-08-14 18:17:49 -04:00
Theos
1463576bf0 REEEEEEEEEEEEEEEEELOADINGGGGGGGGGGGGGGGG (#9201)
* REEEEEEEEEEEEEEEEELOADINGGGGGGGGGGGGGGGG

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* can_reload_say fix

* Update ballistic.dm

* Update ballistic.dm

* move countempties to ballistic so I can check for empty shells in magazines

* moved countempties in get_ammo to base ballistic

* want to fucking die

* Update ballistic.dm
2020-07-25 15:53:14 +01:00
alexkar598
8b963c9626 Documents 61 files (#9306)
* Document the world (#46495)

* Document drone verbs.dm

* Document the outfit datum with autodoc (#45415)

* Uncurse take_damage and document obj_defense.dm (#45146)

The original take_damage proc defined vars for no good reason had some 
duplicate code and wasn't very readable.

If you are wondering why it calls obj_break every time it takes damage 
while below integrity_failure, that's the way it used to be. Most (if 
not all) stuff that takes advantage of this functionality already 
accounts for this.

* Convert some code docs into the auto doc format (#45101)

* Commit Message

* Fixes

* e

* Documents browserOutput.dm (#51439)

* Add autodoc to the callback datum (#45463)

* Autodoc the vending machine (#45468)

* Autodoc the vending machine

* Update code/modules/vending/_vending.dm

Co-Authored-By: Tad Hardesty <tad@platymuus.com>

* autodoc organ helpers (#45464)

* timer proc autodocs (#46530)

* bunch of define autodocs

* ballistic guns autodoc (#45578)

* ballistic guns autodoc

* fixes

* client vars autodoc (#46446)

About The Pull Request

Autodocs client vars

* Autodoc for XB and Research

* shuttle docking autodoc (#48677)

* Add autodocs for reagents (#49478)

* Fix

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Jonathan (JJRcop) Rubenstein <jrubcop@gmail.com>
Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: alexkar598 <>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: actioninja <actioninja@gmail.com>
2020-07-24 21:38:47 -04:00
Jamie D
b69edcea45 Widescreen tweaks (#9162)
* Part 1

* :(

* Ba da Boom

* Jumps Bad
2020-07-09 08:20:02 +01:00
alexkar598
dab25cb5a6 Dreamchecker (#8977)
* Changes obj_break on machines to use parent calls (#46485)

The way stat |= BROKEN was done was a mess, this makes everywhere use obj_break with proper parent calls and adds a signal for when a machine enters the broken state.
Why It's Good For The Game

Better code quality, more signals.

* e

* Can pass refactor (#48659)

* Makes all CanPass procs call parent

* Makes CanPass more extendable and gives the mover a say in the matter

* Replace CanPass with CanAllowThrough to use the new system

Regex replace `(?<!proc)/CanPass\(` => `/CanAllowThrough(`

* Simple optimization pass

* Adds linting for equipped() pickup() dropped() (#46614)

* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review

* does more

* Changes power_change() to respect parent calls for toggling NOPOWER (#46486)

About The Pull Request

Similar to #46485
Now all relevant uses of power_change() call parent, theres a signal sent when a machine changes the NOPOWER flag, all remaining machines that were using power_change() instead of update_icon() have been fixed.
Why It's Good For The Game

code quality, eventually signal stuff. and signal stuff

* Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)

About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167

* Makes Crossed and Moved should call parent (#49671)

* makes setDir shouldcallparent (#49692)

* owo

* hehe

* Update atoms.dm

* Update atoms.dm

* Update atoms_movable.dm

Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: alexkar598 <>
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
2020-06-23 16:15:23 -04:00
Jamie D
4e1eccf423 Update beam_rifle.dm (#8800) 2020-06-20 20:43:41 +01:00
Theos
2a39a2a6f1 eshotgun isnt a taser (#8846) 2020-06-09 15:01:44 -04:00
ToGWtF
66e839f1e4 Fixes sprite (#8723) 2020-05-27 21:45:39 -04:00
boodaliboo
c5507f1f73 ports makeshift laser from hippie (port) (#8527)
* Update laser.dm

* Update recipes.dm

* Add files via upload

* Add files via upload

* Update laser.dm

* Update laser.dm

* Update laser.dm

* Update recipes.dm

* Update granters.dm

* Update granters.dm

* flips the sprite

* Update laser.dm
2020-05-24 19:34:09 -04:00
Hopekz
7edfedcba0 Can now toggle seclite via hand when when on a disabler or helm (#8448)
* Can now toggle seclite via hand when its on a disabler or helm

* whoops
2020-05-20 22:34:33 -04:00
TheGamerdk
1f0f77231e runtime (#8424)
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-05-07 14:52:48 -04:00
alexkar598
2333d64f09 Adds support for 513(and unicode), additionally drops supports for 512 in the process and updates dreamchecker(turdis) and casually fixes about 90 bugs in the codebase (#8324)
* Cherry picks the unicode part 2 PR from TG

* Things

* drop 512 support

* TAN --> tan

* Manually does the things that was in renamed files

* CLAMP --> clamp

* ismovableatom -> ismovable

* bugfixes, tg is bad

* Ports sanitize_name

* Bumps checks

* Fixes new linter errors (#48126)

About The Pull Request

This fixes the errors raised by the new feature I'm adding to the linter: SpaceManiac/SpacemanDMM#119

* Update SpacemanDMM suite to 1.2 (#48785)

* Update SpacemanDMM suite to 1.2

* Fix new lint errors

* Removes unreachable code (#48143)

About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123

* casually fixes 50 bugs

* stoopid evil dreamchecker

* stoopid evil dreamchecker

* stoopid evil dreamchecker

* almost the same thing

* Makes all UIs UTF-8

* Fixes bugs

* Fixes runtimes, some related to 513, some not

* Fixes agent ids

Co-authored-by: MrPerson <spamtaffic@gmail.com>
Co-authored-by: alexkar598 <>
Co-authored-by: spookydonut <github@spooksoftware.com>
2020-05-02 00:43:42 -04:00
Jumps
66ebfe7bc5 Minor fixes from TG (#8336)
* initial

* turdis wake up
2020-04-30 16:14:51 -05:00
Jamie D
c9e86284db Adds plasma cutter to Miner Cyborg 2020-04-12 17:22:01 +01:00
Readystorm546
7fa34d7160 I Fix The Mingun Osprey Through Sheer Willpower And Luck (#7541)
* So i atempt to add to box station

VARIANTS

* Wow i did it

Amazing

* Update minigun.dm

* Update minigun.dm

* Update minigun.dm

* Update minigun.dm

* De-Modularize

Got Em

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

Oh Okay

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

* Update yogstation.dme

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
2020-01-17 07:56:03 -05:00
Nickvr628
bddbfeecdf New Security Tools: Rainbow 6 Edition: Unfucked Edition (#7396)
* Adds all the necessary code for breaching rounds

* Adds breaching slug boxes to maps

* Adds Breaching Tool to code and maps

* new slug design (blunt nose)

credit to Identification

* no more poop shells

* Update YogsDelta.dmm

* Update code/game/objects/items/storage/boxes.dm

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

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

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

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

Co-Authored-By: Nichlas Pihl <nichlas00100@gmail.com>

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2019-12-29 15:55:38 +01:00
Szyszkrzyneczka
ee20223f36 i hope this works
screw you mapmerger
2019-11-30 16:51:05 +01:00
Szyszkrzyneczka
2b9f73a3d8 Removal of deathwand/death projectile
shit's bullshit
2019-11-30 13:20:48 +01:00
Nichlas Pihl
d5aa28f2fd Merge pull request #7122 from Codeatmos/Baynottim
Pick up this bayonet and stab that man NICKVR to death.
2019-11-27 09:08:39 +00:00
Nichlas Pihl
3d52c4be0c Update rune.dm 2019-11-21 15:25:05 +00:00
Codeatmos
ddb836ad30 DEATH TO THE M P L A 2019-11-20 17:42:07 -06:00