Commit Graph

3768 Commits

Author SHA1 Message Date
Ashe Higgs
7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
XDTM
2ac902ab3c Refactors anti-magic into a component (#35639)
* Refactors anti-magic into a component

* plenty o stuff, mainly holy and antimagic traits

* fix

* fix2

* moved to components, moved some of the logic to the component

* don't blame me if the code looks copypastey

* right
2018-02-26 09:45:12 +13:00
deathride58
56896dfc8e Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#35879)
* adds an above lighting layer, adds lighting overlays

* fixes wonkiness with broken and burned lights

* decreases overlay alpha a tad bit

* i gotta test this - removes new() override from mutable_appearance

* readds /mutable_appearance/New() for legacy behaviour
2018-02-24 00:46:43 -05:00
Ashe Higgs
863afe9f9f Adds bastion bourbon and squirt cider (#35892) 2018-02-24 00:05:10 -05:00
BordListian
6da8820fee Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)
* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one
2018-02-23 21:34:53 +02:00
KomradeSpectre
e156b17733 Ports Barometers from Yogstation (#35730)
* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.
2018-02-22 12:50:42 +13:00
coiax
39b0bac044 Mime's Bane recipe (#35570)
* Makes Mimes's Bane use the new EMOTEMUTE trait

It randomly occured to me that I should do this.

Mime's Bane is currently a reagent currently only used in cloning pods
to stop growing clones from gasping from crit/lack of air (since they're
in a pure nitrogen environment).

* 2 Mime's Bane = 1 Mute Toxin + 1 Nothing

* Mutetoxin + nothing + radium
2018-02-19 16:36:46 +02:00
XDTM
9d41e9734d Extensive surgery additions (#35520)
* Extensive surgery additions

* ,

* bioware

* restrict

* implants

* oops my hand slipped

* "i only changed a few lines, surely it's gonna compile, let's just push it and be done with it" --me, once again

* zombie surgery

* Adds brainwashing antag datum

* Antur Reviews

* @Antur part 2

* wow
2018-02-19 14:29:06 +02:00
kevinz000
c3060022a7 [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)
* Cross Z support

* Fixes projectile cross-Z

* removes unnecessary code

* don't draw impacts if you're not impacting

* fix

* unneeded var

* No mapcheck()ing anymore, space does it for us 2.0
2018-02-18 02:41:25 +02:00
vuonojenmustaturska
56366ba3fe Merge pull request #35604 from ACCount12/construction_datum_refactor
Refactors mech construction datums
2018-02-17 17:59:54 +02:00
AnturK
a5bcb83ea7 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 11:34:38 -05:00
oranges
82af086fd8 Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
2018-02-16 15:34:37 +13:00
AnturK
619b273ed3 html_interface removal and crew monitoring console refactor. (#35431)
Quick changes list:

    html_interface gone
    unused card interface gone
    minimap gone from crew console(subsystem not disabled in case something else wants to use it)
    ui_host() now takes user parameter
    Some assets moved around.

Fixes #22124
2018-02-16 09:31:21 +13:00
Tad Hardesty
bbe4d12d13 Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:21:25 +01:00
Iamgoofball
ba570ad32d Fixes the name on the cook's culinary school training (#35635)
Totally forgot to do this
2018-02-15 00:05:52 -05:00
Jordan Brown
83072d60e2 Merge pull request #35612 from vuonojenmustaturska/vuonojenmustaturska-patch-1
Prevents docking ports from being thrown away by chasms
2018-02-13 21:56:57 -05:00
Iamgoofball
4b9360d959 The Cook now only works under siege. (#35597)
The chef's CQC skill now only works in the kitchen area
2018-02-14 09:18:26 +13:00
vuonojenmustaturska
960f42d292 Merge pull request #35531 from ACCount12/mining_tool
Mining tools now use tool system
2018-02-13 18:33:52 +02:00
ShizCalev
bf901492bf Fixes invalid throwat args (#35565) 2018-02-13 14:13:48 +01:00
vuonojenmustaturska
e62b750a78 Prevents docking ports from being thrown away by chasms 2018-02-13 02:53:33 +02:00
ACCount12
1a65c7336a Refactors mech construction datums 2018-02-13 00:46:09 +03:00
ACCount12
f43fcbd1d6 Replaces istype checks for mining tools with tool_behavior checks 2018-02-13 00:09:50 +03:00
ACCount12
2169e8638c Makes mining tools use use_tool and have tool_behaviour 2018-02-13 00:09:50 +03:00
ACCount
6de835a629 Adds tool_behaviour support to crafting, door wires, surgeries and mech construction (#35384)
* Adds tool_behaviour support to construction datums (mech construction)

* Adds tool_behaviour support to wire datums

* Adds tool_behavior support to surgeries

* Adds tool_behavior support to crafting

* New proc, to be used for checking tool qualities in hands

* Improves tool quality support on wires
2018-02-12 20:52:11 +01:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
ShizCalev
3cb6ab32d2 Cleans up some duplicate canusetopic warnings 2018-02-11 09:56:43 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
MoreRobustThanYou
53422e4088 Adds a SCP-294 ruin (#35188)
* Add a SCP-294 ruin

* Convert map to TGM

* Add hostile mobs, random traps

* Add nanites

* Now now, we don't wanna blow ourselves up, do we, Jimmy?

* Blacklist blob chems

* make it harder

* Remove statue; use can_synth; name finder

* Fixup scp_294.dmm

* Fix traps

* Fix traps

* Add to POI list

* TGM-ize

* ruin remap

* damn tags

* Re-add mimics and traps

* New sprites by @militaires!

* Fix trap spawners spawning ctf protection thingys

* map fixes

* New sprite!
2018-02-10 18:39:27 -05:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Jordan Brown
ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt
Revert "Adds the saltmine shuttle. (#35369)"
2018-02-09 00:03:36 -05:00
PKPenguin321
d1c1a28128 adds italian moustache that makes you italian (#35426)
* makes the moustache make you italian

* Revert #34916

* fixes travis i think

removes duplicate replace

* puts the mask on by default, undoes dynamic-a speech-a

rip

* removes unneeded varedits

saves 2 lines woo
2018-02-08 15:29:23 -05:00
vuonojenmustaturska
1c8e450f15 Fixes geiger counters on engiborgs (#35423)
* a commit

* Update geiger_counter.dm
2018-02-08 12:21:06 -05:00
MoreRobustThanYou
1c42a8186a Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 22:01:55 +13:00
MMMiracles
d72c564191 adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 21:23:13 -05:00
oranges
b1f301b39b Revert "Adds the saltmine shuttle. (#35369)"
This reverts commit c7ee29b5b0.
2018-02-08 01:49:57 +00:00
Kyle Spier-Swenson
c068942fc4 Fixes callbacks and invoke time args failing when pushUsr was used (#35395)
* Fixes callbacks and invoke time args failing when pushUsr was used

* y u do dis byond
2018-02-07 20:38:07 +02:00
Dax Dupont
c7ee29b5b0 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 15:16:54 +02:00
Dax Dupont
6f7e89f07f Holopictures and more! (#35303)
* Holopictures and more!

* Remiedation
2018-02-07 13:16:44 +02:00
Ordonis
b96f8aeb6c Mamma-mia! Adds-a the Italian-a language! (#34916)
* Mamma-mia!

That's a one-a spicy meatball! The first of many spicy meatballs!

* I have-a returned from the exile and fixed-a the things people asked-a for!

Includes changing sec so that not every word with sec in it will end
with problems. Uses resident italian advice to make minor edits. The
chef is now mario-tier of not-italian.

* Adds-a the mutation code and-a calls it for the cook at roundstart

Mamma-mia whoever named-a the CLOWNMUT and-a made it a #define trolled-a
the hell out of me-a! It was like-a chasing an actual-a clown!

* Actually bothers to upload the trait definition

Lesson gained: Save all, all the time.

* Case sensitive fun whee

Someday I'll learn to build first

* IT COMPILES-A

Fucking finally.

* Small addition that was left out and attempting to merge resolve the odd DME change

I never actually edited the dme in any way, only dm files; I think I
just haven't updated the master recently, so the exe is in a different
place than the repo. Don't expect this to compile.

* Fixes .dme to match with master

If this doesn't work I'll start reverting to the last version that didn't throw a fit.

* Commit to get travis to recheck

.dmm should be fixed, so this needs rechecking. Also, adding wine
replacement.

* The pizza, she is a-ready to share-a with the people!

Fixes a lot, does as much sanitization as is possible so that words like
insect don't become inpoliziact or similar.  For some words, punctuation
may be displaced by the final space necessary to keep normal words from
running into eachother.  This part, at least, is done.
2018-02-06 22:59:37 +13:00
vuonojenmustaturska
c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
ShizCalev
ee18d6f8e2 Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#34907)
* Cleanup

* .

* Synced special_role & factions with role defines

* Revert

* more cleanup

* fix
2018-02-04 03:03:34 -06:00
AnturK
c61037629a Adds some customization to ruin loader (#35209)
* Adds some customization to ruin loader

* Bluh

* stuff

* Fixes
2018-02-04 01:54:40 -06:00
AnturK
05aa7257b1 Hmm explicit might have been better for readability. 2018-02-03 17:57:55 -06:00
AnturK
25433e05cb Fixes blood overlay layers. 2018-02-03 17:57:55 -06:00
Tad Hardesty
7c23b916f8 Add whiteship dock to space ruin code (#35170) 2018-01-31 03:59:58 -05:00
Robustin
418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
Ashe Higgs
d6cae1f6e1 Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849)
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
2018-01-29 21:33:40 +01:00
kevinz000
26ad237862 Projectile hitscan refactor and visuals (#34363)
Moves beam rifle snowflake code up to projectile level for a proper hitscan system.

🆑
rscadd: Chameleon laser guns now have a special firing mode, activated by using them in hand! Only certain gun disguises will allow this to work!
/🆑
2018-01-30 09:23:51 +13:00