Commit Graph

7080 Commits

Author SHA1 Message Date
Mickyan
eb9fa0d8f5 Add pacifism check for screwdriver/bottle attacks (#38416) 2018-06-13 00:22:26 -07:00
oranges
fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 11:48:21 +12:00
ShizCalev
3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
Tad Hardesty
106f5af48b Fix lockboxes not actually being locked 2018-06-08 23:22:12 -07:00
MrDoomBringer
14371cbd3a Gives the toy emag a description showing that it is a toy. (#38341)
* Wa la

* Hahah holy fuck my ONE LINE FLUFF CHANGE doesnt compile

what's an escape character

* i should get FUCKING GITBANNED for this SAD DISPLAY FUUUUUUUUUUUUUUUUCK

NEVER WEBEDIT ON UR PHONE KIDS
2018-06-08 14:18:10 -04:00
81Denton
115ff7f6f1 Runtimestation tweaks (#38340)
* runtimestation tweaks, debug subtypes

* moves exposed wire to maint tunnel
2018-06-08 10:51:00 -07:00
deathride58
c5a0e14acb Tones down values for a lot of different hotspot_expose calls (#38232)
* Tones down values for a lot of different hotspot_expose calls

* Update LINDA_fire.dm (#38217)

* Automatic changelog compile, [ci skip]

* Slight changes to camera network code (#38223)

* Removes a useless var and corrects two cameras to use the automatic naming system to reduce dv usage.

* Damn github didnt notice this was here....

* Fixes datediff not returning (#38215)

* Fixes pocket items being deleted when monkeyizing (#38220)

* Automatic changelog generation for PR #38220 [ci skip]

* readds atmos heating from hotspot_expose(), as requested by naksu

* Tones down hotspot_expose values for sparks moving and destroying

* tones down item heat by a lot. no more burning your face off after smoking a cigarette
2018-06-08 15:53:10 +03:00
AnturK
8140d95758 High Gravity - First Draft (#38043)
* High Gravity - First Draft

* Replaces has_gravity defines for areas.

* Default gravity ztrait

* Adds some gravity effect and skips damage at gravity = 2

* Paralysis icon

* Antigravity grenades for some abuse

* Makes the damage treshold a define and makes alert description more accurate.

* Bluh
2018-06-08 15:48:07 +03:00
AnturK
569545d213 Fixes pAI emp act. (#38352) 2018-06-08 15:46:37 +03:00
Tad Hardesty
9c97ea7f05 Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 21:06:27 -04:00
Jordan Brown
62f20ca4a7 Merge pull request #38288 from Jalleo/Removes_Admin_detect
Removes a defect concerning a simple tool in the admin toolset
2018-06-07 09:51:38 -04:00
81Denton
0b1db4e31e Arcade reward: snack rigs (#38268)
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
2018-06-05 11:27:18 -07:00
blah
cdf02a2f3d Removes a meme item that actually could be abused by bad people. 2018-06-04 20:27:31 +01:00
vuonojenmustaturska
ccade665f5 Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225)
* overlay attacks

* this works too

* fix trays too
2018-06-03 14:24:45 -04:00
ShizCalev
0a29d1ec9c Fixes cigar bugs (#38218) 2018-06-02 15:20:56 -07:00
Jordan Brown
6d0179f57b Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 12:27:38 -04:00
JStheguy
352943e891 Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo (#38161)
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony

* does sprite things to lighters and cigar cases

* darkened cigar case interiors

* tweaks lighter flames
2018-06-01 10:53:16 -04:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
ShizCalev
c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
Firecage
79bea7868b Adds module upgrades for the Janiborg (#38114)
* Adds upgrades for the Janiborg.

* Does the requested changes.
2018-05-30 18:09:03 -07:00
oranges
b03958a275 Merge pull request #38122 from AutomaticFrenzy/patch/derived-mutant
List hulks and catpeople as "Human-derived mutant" in health scans
2018-05-31 12:52:25 +12:00
MrDoomBringer
2741541774 fixes people trying to fix the bangammer's grammar (#38129)
* that means you, Michael-Ashfield

* fixes grammer

* blockquotes
2018-05-29 15:13:13 -07:00
Tad Hardesty
ba11217a84 List catpeople and hulks as mutants in health scans 2018-05-27 23:25:42 -07:00
Tad Hardesty
2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
Armhulen
5d826f2ca4 Custom Chaplain Armor Kits (#37569)
* giant dad set

* twop underway

* initial

* initial

* no special armors :((((

* bye twop

* no more special armors

* f

* more removals

* fixes

* normieizing the armors pt1

* ok, finally

* I'M DONE I DID IT

* removals

* this will not compile but next commit in two commits it will

* this will not compile but next commit it will

* it compiles 20 dollars says it compiles

* i am so sorry

* fixes everything, >:(

* *coughs up hairball*

* cobby's suggestion

* pbool'f fhttrfgvba

* OOOOOOOOH YEAAAAAAAH BABY

* quieter

* AH OKAY THERE
2018-05-27 13:50:59 -07:00
Grandmother of 50
f298dbe18c Those footprints are... moving? [Chameleon Proj will let you scan decals] (#38071) 2018-05-27 13:44:45 -07:00
ShizCalev
4ad3616091 Capitalizes CentCom (#38086)
* Capitalized CentCom

* neediful
2018-05-26 21:18:39 -07:00
Dax Dupont
db2a6f6efb Gun overlays 2: Electric boogaloo. (#38003)
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
2018-05-26 21:45:02 +03:00
Iamgoofball
19992668fd Eat the ice cream (#38028)
* Eat the ice cream

* Update robot_items.dm

* Update robot_items.dm
2018-05-26 00:23:52 -04:00
Jordan Brown
f3db0f57e0 Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
Fix various bugs with telekinesis
2018-05-25 11:48:50 -04:00
vuonojenmustaturska
4f210f49f5 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 14:36:56 +02:00
kevinz000
baf3fbb0cd Shuffle Exited call to after loc is actually changed in forceMove (#38022)
Fixes storage forcing everything to mouse opacity fulltile
2018-05-25 00:08:15 -07:00
Dax Dupont
92a811ee89 Adds VR Snowdin and Syndicate Trainer/VR Update roll up (#37915)
* Adds VR Snowdin and Syndicate Trainer

* Replace var edit

* I did forget to add a few

* Adds one full outfit spawn

* internals too

* closet

* Extends same Z level check to monitor and emping

* restricted uplinks

* camera bug fixes

don't talk about the bees

outfit changes

More items

outfit fix

* Adds vr sleepers to runtime station

* More mapping fixes

* Adds telecomms to taunt your enemies

* More restrictions

* Some fixes

* badabing

* More fixes

* emag related changes

* forgot the ract

* Additions

* griff resistance mode

* minor changes

* Removes old centcom away map

* Pushes you out of VR if you try to ghost

* this is :b:roke

* this shit is not :b:roke

* as requested
2018-05-24 17:31:18 -07:00
MrDoomBringer
32c8d0abc5 Cargo Update: Cargo Supplypod Beacons! (#37345)
(THE CODEX ASTARTES CALLS THIS MANEUVER: STEEL RAIN) [New sprite!]

* file

the boy

asdh

beacon overlays

first pass complete bring out the drinks boys

fixes!

fixes!

whups fix name

speed

makes coffin a crate to prevent runtimes

sprite fuckup:the musical

whups more fixes

why tf was screengen modified???

TO THE FILE

devices

changes things

p[omf pomf

uhg

alright fuk it

issue fix pt 1

in which i make merge conflicts my bitch

by fixing devices.dmi and tgui.js

oh shit

forgot about the items repath

hm

nah

merge conflict a

then all ya gotta do is whip

* shiv review me code reeeeeeeeeeeeeeee

* rebase conflict

* anturk

* asdf

* wooooeeeeeeh makin bacon

* dont forget about lil old me

* id like to give a shoutout, to my man spacemaniac. on the soul plane. rip in peice, my bugs. rip in peice

* spacy man what is ur spacy plan

* 1st

* 2nd

* organization also a thing

* so i figured out why defines didnt work sometimes across files. this fixes the last issue rn

* forgot to cop the commit

* fuck how am i so stupid

* adds comments and agrees with spacemaniac

* asdfghjk
2018-05-24 17:02:51 -07:00
ShizCalev
60238ecd51 [s] Power monitor tweaks and fixes (#38005)
* Power monitor tweaks and fixes

* Crouching tiger, hidden power monitor

* flavor text
2018-05-24 12:27:49 +03:00
vuonojenmustaturska
4f0b0b7ec1 Replaces /atom.initialized and .admin_spawned with flags (#37981)
kill .initialized and .admin_spawned from /atom
2018-05-24 02:20:50 -07:00
Tad Hardesty
7a83c0dca5 Fix TK teleporting filled sandbags 2018-05-23 16:49:27 -07:00
Tad Hardesty
c5b6c18c7e Fix power tools being deleted if adjusted using TK 2018-05-23 16:49:24 -07:00
Tad Hardesty
98f8f88104 Fix flipping of trinary pipe fittings and related RPD tooltips (#37982) 2018-05-23 13:31:51 +02:00
cyclowns
49b4aa928e Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-23 13:38:59 +12:00
KorPhaeron
0e88fe7cc4 Anomaly Neutralizer (#37879)
* Anomaly Neutralizer

* Deletes properly

* Nitpick grammar
2018-05-22 12:57:04 -07:00
vuonojenmustaturska
1eccbcca18 Adds an EMP protection component, allowing ANYTHING to be protected from EMP (#37671)
The component is initialized with any combination of three flags, EMP_PROTECT_SELF protects against effects that target the object itself, EMP_PROTECT_WIRES protects against wires being messed with similar to the NO_EMP_WIRES_1 flag which this PR removes, EMP_PROTECT_CONTENTS protects against things that are inside the object like organs, internal "non-virtual" power cells and the like

This enables (but doesn't introduce) new mechanics such as adding EMP shielding at runtime to any atom, or taking it away.
2018-05-22 11:38:02 +12:00
Firecage
c1f10aecce Adds department wardrobe vendors to the code and to Boxstation. (#37859)
* Adds wardrobe vending machines.

* Adds the refill cartridges to cargo.

* Removes access requierments and fixes spelling errors.

* More spelling errors fixed, curse the English language.

* Added sec skirts and grey uniforms to the sec vendor, and added formal uniforms as premium items to it.

* Fixing some grammer/spelling errors and adds the purple bartender uniform to the vendor.

* .

* Does Shizzy's requested changes.

* Adds these machines as options at the vendor circuit board. Adds more product ads.

* Fixes compile error.

* Sprite fix and two more things to the MediDrobe.

* adds the sprites

* Adds the vendors to box station.

* splits the supply packs up into different departments. Costs adjusted to be consistent with the autodrobe crate.
2018-05-21 19:12:22 -04:00
Jordan Brown
cc10f7738d Merge pull request #37956 from ShizCalev/chem-grenade-cleanup
Cleans up duplicate get_area's in c.grenade priming
2018-05-21 17:35:46 -04:00
ShizCalev
822a994a32 Fixes defibillator runtime 2018-05-21 14:54:09 -05:00
Tad Hardesty
f53caac04a Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 12:45:52 +03:00
Armhulen
8a77ffe12e crashing the server with no survivors 2018-05-20 19:38:51 -05:00
ShizCalev
02296b62ca Cleans up duplicate get_area's in c.grenade priming 2018-05-20 18:32:53 -04:00
pubby
9ca6661140 [ready] cargo bounties (#37833)
* Cargo Bounties

* Rebalance and merge exports into bounties.

* Tweak and add bounties.

* Fix spelling errors + tweak mech prices.

* Last minute bugfix

* Add bounty consoles to maps.

* Naksu changes

* save 500 cycles woooooooooooooooooooooooooo

* One last price tweak

* Nerf addy and alien sheets
2018-05-20 18:44:11 +12:00
iksyp
721ae76601 [READY] Gives Stacking Machines and their consoles machine boards (#37607)
* patch-2

* does everything on the TODO list

FUCK YEAH
*breaks up the engineering node design ID's for readability
*linking the device via multitool is possible
*The machinery construction "recipes" are less shit and make a bit more sense

* coil

* did somebody say RUNTIMES?

*fixed runtimes when there is no link on the stacking machine console
*added feedback for unlinked consoles
*it's -> its
*proper typecheck

* achieved with [src]
2018-05-19 23:39:14 +02:00