Commit Graph

31357 Commits

Author SHA1 Message Date
necromanceranne
ffcf609a36 Fixes neckgrabs being only escapable if RNGesus comes down and saves you from your fate (#51427)
* Fixes grabs being impossible to escape, at the expense of making it easier to escape a grab. Damage inflicted by resisting increased to compensate.

* Upped the time between resists a bit
2020-06-03 21:33:36 +02:00
Fikou
6245b51884 atmos jumpsuits now have the same protections as engi jumpsuit (#51243)
* fix (maybe)

* atmos jumpsuits now have the same protections as engi jumpsuit

* gosh i hate plasmem

* hhhnnn

* fuck
2020-06-03 09:58:41 -04:00
skoglol
13a6293508 Removes some dead code (#51426) 2020-06-03 15:58:53 +08:00
ATH1909
2f7913ceba replaces the mulebot 16 second hardstun with an 8 second knockdown (#51277)
* F

* Update mulebot.dm
2020-06-02 21:30:09 -04:00
EOBGames
22ed61f2e9 [READY] Codename: Blue Eyes White Jumpsuit, the TG TCG, Part 1, Reborn (#51252)
* here goes nothing

no really this is basically nothing

* dme is less dumb

* aaaaa string files

* Card backend (#3)

* Adds card backend and hotloading

This is a combination of 2 commits.

OH SHIT THE SM IS ON FIRE

WE DONE LADS

* Woop

* Best we'll get

* fixed file system, courtesy of potato

* updated tools (thanks potato), now up to 40 cards

* Adds rarity (#4)

* Adds rarity

* just to be sure

* Adds it to cards

* Didn't read templates WHAT A NERD AMAROIGHT

* Commets

* Woop you'd think I'd know my own system

* There we go

* Fuck you EOF (#5)

* Makes rarity not suck (#6)

* Fuck you EOF

* Makes rarity not suck

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

* Makes rarity work as expected, thanks dogman (#7)

* smolcards

* Adds datum cards (#8)

* Datum cards

* Some docs and a little bit of cleanup

* fuck

* problems be had

* Fuck (#9)

* fucko bungo RELASE ME FROM THIS HELL GIT

* datum FUCKING AHHHHHHHHHHH

* packs and games

* boomer mood (#10)

* Card debugging (#11)

* Adds debug vars

* that's a bit better

* shit

* unfucks rarity

* scales sorted

* That should do it

* Parity

* fun fact

* series 1 json

* and so it is done

* Don't need this, I'm dumb.

MacRo-Op???@?#?@??!#?!@

* BRAINDAMAGE

* resin redux, smaller cards

* shut up shut up shut up IT'S ASSUMED TYPE OK? *it's not all that bad*

* double rarity TABLELS, fixed the silly linter

* flippers and rarities

* guaranteed rarity, rarity tables

* fuck it let's ask

* resinfront

* 2560 core set

* fixes flippers

* template icon, extra variable juice

* ADDS SPEED (#12)

* FUCK FUCK FUCK SHIT I BROKE IT AGAIN

* Kills my dreams in the NAME OF SPEED

* and some cleanup

* Minor changes, some qol (#13)

* couple small changes, moved the datum procs around to make things cleaner, made some comments autodocced

* Let's be more clear,

* and a woooop

* Removing ids, carpel tunnel edittion (#14)

* Subsystem

* Carpel tunnel completed

* woop

* curator is no longer equipment

* I'm not dumb you're dumb (#15)

* minor rarity tweak

ladies and gents, it's finished

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-06-01 22:50:07 -03:00
Rohesie
b73e2c4b0e Adds a knockedout trait, begins refactoring mobility 2.0 (#51348)
* ko

* change request
2020-06-02 00:14:49 +02:00
TemporalOroboros
2438ef86fe Firesuits and Radsuits fit the big tanks now (#51395)
Changed the allowed suit storage items for firesuits and radsuits to allow any internals tank.
2020-06-01 03:13:46 +02:00
BeeSting12
b0a17333f3 fixes grammar (#51387) 2020-06-01 03:04:12 +02:00
Rohesie
9768c09637 Client vars (#51325) 2020-06-01 02:42:18 +02:00
PrimordialOoze
60a9158a9b Better Player Ignore (#51353)
* Revamp the player ignore system

* Move a variable definition out of a loop

* Replace a |= with +=

* Improve some code

* Fix some code

Co-authored-by: Local <none>
2020-06-01 01:01:40 +02:00
Fikou
5c88d587b4 removes king goat (#51366)
* Revert "Remodels king goat ruin (#50813)"

This reverts commit 26ffe3d539.

* numba 1

* bye

* bye 2

* bye 3

* fuck bitches get money

* hey this was actually a good change

* goat sounds

* fuck

* h

* waaaaaaaaagh
2020-05-31 17:38:07 +02:00
Timberpoes
9e007d1d71 Removes ability to do multiple simultaneous surgeries without Rod of Asclepius (#51369) 2020-05-30 20:48:05 -04:00
MacBlaze1
d8e49fa3b3 Update clothing.dm (#51337) 2020-05-31 02:02:49 +08:00
Fikou
d804b2d444 removes a lot of free illegal tech items (#51357) 2020-05-30 16:37:52 +02:00
GhostEcho
289839c6ea Increase Carp PRice by 1tc (#51330) 2020-05-30 11:06:52 +02:00
KathyRyals
ca5b7f0a83 Fix Nanite Programmer and Nanite Program Hub deconstruction (#51245)
* Fix Nanite Programmer and Nanite Program Hub deconstruction

Bug fix for the deconstruction process of the Nanite Programmer and Nanite Program Hub

* Use _act overrides, implement new icons

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-05-30 05:06:21 -03:00
Jordie
469e1921f4 Delays loading of random books (#51144)
* delays loading of random books

* fix map var

* review

* return

Co-authored-by: Jordie0608 <=>
2020-05-30 02:20:38 -03:00
Ryll Ryll
6bf874839a Adds new body type pref (#51058)
* tgdb

* tgdb

* Auto stash before cherry pick of "balance changes, enables burn surgery, various body improvements"

* moves unnecessary list out of client

* describes a var

* corrects
2020-05-29 14:25:01 -03:00
ArcaneMusic
cab9d2e4b7 A fix for botany sprites showing ERRORs. (#51340)
* I did, I fixed botany forever

* Whoops, still need a min

* Update code/modules/hydroponics/hydroponics.dm

Fair point

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
2020-05-29 16:16:16 +02:00
TheVekter
5e4e7134e0 A few small Cargo bounty tweaks (#51329)
* Removes the Phazon from the cargo bounty pool.

* Adds a bounty to Cargo requiring a tank of hydrogen
2020-05-29 13:24:45 +08:00
ArcaneMusic
6ac1f5f9d2 Tools for your belt. (#51328) 2020-05-29 13:12:23 +08:00
spookydonut
3bcb6602b6 Should fix a rare edgecase with explosions and shuttles (#51017) 2020-05-28 19:36:24 +02:00
MrDoomBringer
3546417d7f Improves player retention by leveraging existing assets to incentivize higher average playetime (#51297)
* im a player ok that means i play

* FINE

* you win this time, shaps

* makes floyd happy

* Update code/__DEFINES/misc.dm

* i was just playing cyberboss dont be mad at me

* changes one character in a comment
2020-05-27 18:29:42 -04:00
nemvar
8aa8d867a4 Fixes scaling names (#51311) 2020-05-27 23:09:07 +08:00
ArcaneMusic
844267dc32 Adds two new biogenerator chemicals to botany. (#51304)
* Initial Commit, adds both sidegrade chems.

* Actually lets keep both plants distinct enough, ya know
2020-05-27 23:07:17 +08:00
MacBlaze1
666e1e2653 Fixing crew monitor suit sensors (#51268)
* first steps

* Update _under.dm

* time for bug testing

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* more fixes and implementation

* Update crew.dm

* Update clothing.dm

* more bug fixing

* Update crew.dm

* debugging

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* added stuff to nanites

* goddamn nanites

* nanite cleanup

* Update crew.dm

* Update crew.dm
2020-05-27 15:54:37 +08:00
Jordan Brown
c3d0a6dd1c Don't throttle TGS commands (#51292) 2020-05-27 15:46:34 +08:00
Ryll Ryll
7a3fc56220 Removes Shotgun Ability (#51295)
* removes shotgunning

* removes shotgunning
2020-05-27 15:44:09 +08:00
zxaber
5a07c3f29a Adds two new modular apps: Lifeline for tracking suit sensors, and the Syndicate-only Fission360 for tracking nuke-related items (#51152)
About The Pull Request

    Adds two new modular computer programs. Both use the same underlying parts;
    -- Lifeline is an improved suit sensor tracker, showing where the target is on a grid if they're within 24 tiles. The scan button has a two-second delay (since the program has to check every humanoid in glob.human_list for trackability and we don't want that spammed). The app works pretty much how you would expect.
    -- Fission360 uses the same processes as above but for the nuke disk and all nukes in the area (self destruct, beer, syndicate). Available only via emagging a tablet for the moment.
    --
    Rudimentary multiZ support exists, in the form of replacing the crosshairs icon with an up or down arrow (once it's visible within the circle) to indicate if the target is above or below, if both the target and the computer are on a station Z level of some sort. Also, the grid lines are exactly two-tiles apart.

    Added support for programs to list special assets to load, so that we don't have to have every program loading all modular program assets. The radar apps use this to load the background grid and the too-far-away-to-display arrow.

Why It's Good For The Game

More modular apps are good. I'm hoping to see a syndicate-version of the modular tablet in the hands of nuke ops at some point, which is really where Fission360 will make sense. Otherwise, it's an extra tool for traitors with the nuke theft objective, I suppose.
Changelog

cl
add: Two new apps for modular computers are available: Lifeline for Medical, and Fission360 for anyone with access to the Syndicate repository. Lifeline is an improved suit sensors tracker, and Fission360 is the same but for nuclear-related things.
/cl
2020-05-27 15:36:28 +12:00
MacBlaze1
f28e8e4c3b abusing AIs (#51284) 2020-05-26 14:15:15 -04:00
Qustinnus
cab62745bb fuck (#51250) 2020-05-26 22:19:31 +08:00
Nick Warzinski
4be4131ded Add Engineering Foyer access for Paramedic (#51253)
* Add Engineering lobby access to Paramedic

* Add Construction access for Paramedic
2020-05-26 22:16:29 +08:00
William Wallace
e2a6e4de8b Fix botany grafts & glitchy-infinite-plant-spawney-ness (#51257)
* grafts taken from plants with a different gene to 'perennial growth' now work

* don't store same plant_gene ref on plants during cross-pollination
2020-05-26 22:15:40 +08:00
LemonInTheDark
a08f2113a4 Unfucks smallscreen, removes my stupidity (#51266)
* slightly less SHIT FUCK SHIT FUCK

* Turns out we do need this

* YaYeet

* That should do it
2020-05-25 23:38:10 -03:00
WarlockD
64a71e83cb Fixes Monkey Internals (#51263) 2020-05-25 23:31:00 -03:00
MrDoomBringer
ceea9b6793 [Ready] Skillcapes II: Revenge of the broken github: A Skill Menu Special: New Sprites Edition (#50656)
* 10K hours

60,000 minutes
hahah


sure if you want a trailing newline i can do that


default cloak gets default skill


lazy list and no equip good


necessary ig


Update code/datums/skills/_skill.dm

Co-Authored-By: nemvar <47324920+nemvar@users.noreply.github.com>
Update code/datums/skills/gaming.dm

Co-Authored-By: Angust <46400996+Angustmeta@users.noreply.github.com>
WIP PDA skill monitor program


hacky fixes till i refactor skills


refactors skills a bit, adds admin skill edit menu


If you have a failing, it's that you're always demanding perfection

...IF you have a failing
i think that's it for the admin skill manger


appeases lord flord


bruh


level names


FUCK!!


unga


Update code/modules/vehicles/vehicle_key.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Update code/modules/admin/topic.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Update code/modules/admin/skill_panel.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Update code/modules/admin/skill_panel.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Apply suggestions from code review

frick

Co-authored-by: Rohesie <rohesie@gmail.com>
EOL and dumb spaces


more rohsie bait


tgui: Query Windows Registry for BYOND cache directory

hell yeah brother


update tgui and dmi


CLRF and bat file


typo ig

* tgui and new janicloak that i accdiently changed on another branch

* jani

* gamer cloak

* trim trailing whitespace

* tgui

* bruh

* variable renaming
2020-05-25 21:46:22 -03:00
Timberpoes
8d99381264 Fixes SMES not charging from self-recharging cells. (#51240)
* Check for slime cores and charge based on them

* Spellchack

* Implemented self_rechaging check instead.
2020-05-25 23:34:01 +08:00
Fikou
76af297c4a necropolis tendril loot changes (#51044)
* necropolis chest changes, concussive gauntlets

* fixes bad things

* h

* ah yes, the "get banned" grenade as lavaland loot

* better code

* fuck

* what did he mean by this

* FUCK!!

* oops

* hamburger cheeseburger big mac whopper big mac whopper big mac whopper

* spel fix

* wh*t the heck?

* this file has all the other tendril loot so
2020-05-25 09:18:47 +02:00
JoshAdamPowell
d9da3d54e5 Buff granibitaluri recipe (#51157)
* Nerf granibitaluri recipe

* Automatic changelog compile [ci skip]

* Revert "Automatic changelog compile [ci skip]"

This reverts commit 7706ead79cb55871d0da8d675c09bfd631d67088.

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Revert "Automatic changelog compile [ci skip]"

This reverts commit a2ebbc6d9f9c3623ac1c2fd32296ef6cc80ba45b.

* Revert "Automatic changelog compile [ci skip]"

This reverts commit 73f36a262bdff9d6131324e1af633f2748e31548.

Co-authored-by: Changelogs <action@github.com>
2020-05-25 07:48:40 +02:00
Ryll Ryll
31ea796672 Removes sleeping carp's hidden damage resistance + 40 brute crit punches, lowers price (#50904)
* remove resist and crit

* grammar
2020-05-25 07:16:39 +02:00
kevinz000
82f15769a9 Buffs Hierophant (melee range cheese begone edition) (#50857)
* Update hierophant.dm

* Webedit from phone
2020-05-25 07:14:21 +02:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
Tetr4
2dbc7233b0 Fix ghosts alt/ctrl clicking atmos devices (#51148)
* Fix ghosts alt/ctrl clicking atmos devices

* fix logic issues (#1819)

# Conflicts:
#	code/game/machinery/_machinery.dm

* Revert "Fix ghosts alt/ctrl clicking atmos devices"

This reverts commit 0c73a3e98c438da9feddcc9cc008323ba178426e.

* Add logging to atmos control and alt clicks

* Call procs only if needed

Co-authored-by: Isaac <qwertytrogi@gmail.com>
2020-05-25 03:18:17 +02:00
Ryll Ryll
0276e4206e Hotfix for broken lobby menu (#51260)
* letting me down letting me down letting me down

* tumbling down tumbling down tumbling down
2020-05-25 03:14:35 +02:00
Fox McCloud
d7da3e8745 Remove ancient unused "wear_id" var on xenos (#51236)
Come, let me tell you a story of the old days----of SHITCODE.

AGhhhhh.

Once upon a time, SS13 code was terrible (who are we joking, it still 
is, but that's a story for another day), and when any carbon subtype, 
minus humans, talked over radio, it would runtime.

Of course, coders set about fixing this problem---can't have nonsense 
like that, so...of course, the most logical thing was done.

Instead of solving the awfulness that was not only using the wrong 
istype check and a wonderful colon override as well: 
9eb0e80ae7/code/game/objects/radio/radio.dm (L148)

A "Fix" was applied instead: 
9eb0e80ae7 (diff-b5f801c8078b7d8dd9f0661b359dfa9e)

Whereby `var/obj/item/card/id/wear_id = null` was added to monkeys and 
aliens to "fix" them having an ID holder and not throwing a 
runtime.........Thus ensuring:

Fox would find it one day and call this utterly moronic and while also 
ensuring that all future carbon mobs created without implementing this 
same "fix" would have the same exact problem.

Then radio code got rewritten to be non-stupid and this still hung 
around until today.

The End
2020-05-24 15:15:14 -07:00
LemonInTheDark
4328cdcbd1 that'll do it (#50985) 2020-05-25 02:19:26 +08:00
MarioWizard119
f484131af2 synthflesh works with bottles and foam (#51101) 2020-05-25 02:16:21 +08:00
Tad Hardesty
5e37952b81 Fix name of SDQL arccos wrapper (#51087) 2020-05-25 02:15:13 +08:00
spessman-007
ab84042f94 [READY] Improve spelling (#51134)
* Improve spelling

* Spell isn't, ain't, shouldn't, hasn't, wasn't correctly

Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 02:13:37 +08:00
Tlaltecuhtli
4f44aa1ba9 re prs #50986 because the change didnt actually get merged because git hub broke things (#51153)
* 1

* Update bottler.dm
2020-05-25 02:10:31 +08:00