Commit Graph

11216 Commits

Author SHA1 Message Date
oranges
fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 11:48:21 +12:00
oranges
de389ee586 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox
[s] Fix lockboxes not actually being locked
2018-06-12 11:44:24 +12:00
kevinz000
bddba58241 Readds actual fun to admins throwing around drop pods (#38374)
* Readds fun

* Fun
2018-06-10 02:53:55 -07: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
fludd12
0d429e01b8 [READY][FINALLY] Various Crossbreed Updates (#38039)
* A Variety Of Updates

* Lovey Sprites!

* Adds implementation for listening status effects.

* Fixes implementation, uses defines instead of magic strings.

* Completely reworks status effect listeners

* Fixes Love Potions

* Fixes Approximately All The Things.jpg
2018-06-08 15:51:03 +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
MrDoomBringer
424bc0a105 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290)
* Arianya

* whups caps
2018-06-05 16:01:48 -07:00
vuonojenmustaturska
9c0b5fa881 Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 15:59:46 -07: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
81Denton
b77192f9ac Adds missing minerals to /everything closet (#38267)
* adds bs/ayy minerals to everything closet

* plastic+wood
2018-06-04 13:55:16 -07:00
blah
cdf02a2f3d Removes a meme item that actually could be abused by bad people. 2018-06-04 20:27:31 +01:00
MrDoomBringer
681740528b Adds a Supplypod-delivery admin smite (#38069)
* wa la

* oop forgot an icon

* buildmode compatibility

* ok

* makes centcompod default

* CentCom pods fall faster and are capatilized right

* yike

* yike2

* FASTER

* white space and default icon state

* spacemaniac thanks
2018-06-03 22:36:53 -07: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
ShizCalev
7946099ed4 Fixes syndicate bomb text overlay clipping on 3 digit values (#38132) 2018-06-01 13:51:21 -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
Jordan Brown
e6755b2cac Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors
Set cult floor effects to be on the floor plane
2018-06-01 10:50:47 -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
e6e9dbffe4 Corrects bronze floor & table's name (#38164) 2018-05-31 13:31:26 -07: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
Tad Hardesty
390c7a65c4 Set cult floor effects to be on the floor plane 2018-05-30 21:53:20 -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
oranges
29da5a1914 Refactors how overlays handle the compile step (#38002)
Robustin says:

The very heart of our overlay code, a single line that basically boiled
down to overlays = new_overlays, was the cause of so much overlay lag.
Human overlay code was by far the biggest culprit. Most objects have 0-2
overlays but humans are marching around with 20+ most of the time and
the current system was spending a LOT of effort comparing 20+ image with
20+ other images and then apparently rendering them all anyway. Human
overlays are at least 10x the cost of any other overlay process and on a
busy server the overlay compiling was 2x the cost of any other system.

I compared the cost of overlay changes by picking up/dropping a PDA in
the dorms 250 times, with a 50% chance to use our current overlay
compiler and a 50% chance to use a "direct addition/removal (+=, -=)
approach:
CURRENT         1120ms  133     (avg:8.4210529327392578)
SCRAPS  6ms     112     (avg:0.0535714291036129)

Now this PR makes our whole overlay subsystem use that approach for
overlay compiling and the early results look incredible. The best part
is this is just the START of improvements. Humans benefits the most
because their icon system was already designed for small, incremental
overlay updates. By moving other code from "Cut everything, then put it
all back" to only updating the necessary overlays (cough, APC's), we can
see similar improvements.

oranges says:
I've picked up this PR because robustin vanished, but I do see the value
in the approach, only things I added were the checks for the overlay
list len changing

I also retabbed the entire file because I am a brainlet and did it
without thinking
2018-05-31 03:39:28 +03: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
Dennok
7a8ce417a0 Reflect fix (#37964)
Reflectors reflect at expected angles at long distances.
2018-05-28 00:00:04 -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
Tad Hardesty
4afd6fd2a0 Refactor machinery/anchored to default to TRUE
Deletes /obj/machinery/thruster.

Changes the density of the following abstract types:
- /obj/machinery/modular_computer
- /obj/machinery/mineral
- /obj/machinery/field
- /obj/machinery/particle_accelerator
- /obj/machinery/abductor
- /obj/machinery/telecomms
2018-05-27 19:23:25 -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
KorPhaeron
f5e063414a Bag of Holding Rework (#38010)
* Bag of Holding Rework

* RCDs work on chasms

* No transit space nonsense

* Fixes runtimes

* No infinite chasm
2018-05-26 00:27:32 -04: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
c5f6eb60b9 Merge pull request #38044 from Mickyan/bronzegirder_spelfix
Fixes bronze spelling in girder construction
2018-05-25 12:00:24 -04:00
Jordan Brown
78db4ed30e Merge pull request #37960 from AutomaticFrenzy/patch/resting
Fix some inconsistencies relating to resting
2018-05-25 11:56:08 -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