Commit Graph

3742 Commits

Author SHA1 Message Date
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
vuonojenmustaturska
9df47d0962 Buffs BZ gas by allowing it to interfere with lings' hivemind access and chem regen (#35061) 2018-01-29 14:32:10 -02:00
vuonojenmustaturska
996e4c6c47 Merge pull request #34967 from ACCount12/blueprint_wire_view
Having station blueprints in your hands now reveals function of wires
2018-01-29 13:02:27 +02:00
XDTM
9b93747d36 Abductor additions: replaces and improves glands, new surgery type (#35012)
* Abductor additions: improves glands, new surgery type

* fixes
2018-01-29 11:50:32 +02:00
Jordan Brown
5ebd91056a Merge pull request #34886 from AnturK/reshuffle
Antag directory reshuffling. And some minor fixups/renames.
2018-01-26 09:47:20 -05:00
Dax Dupont
6d2e14913e Holorecord fixes and additions (#34882)
* Fixes name not changing on manual record

* Autolathe material changes

* Allows renaming holodisks and copying records between disks.

* Adds looping

* copy pasta

* sure why not i guess it's not liked i tested it and it worked anyways or anything
2018-01-26 14:17:14 +01:00
AnturK
3ce60ed792 Antag Reshuffling. Accomodating to people dumbasses caring about whitespace 2018-01-26 11:33:22 +01:00
ShizCalev
61fe922cce clear_zeroth_law sanity check 2018-01-25 22:50:47 -06:00
ACCount12
063374b02e Having station blueprints in your hands now reveals the function of each wire 2018-01-26 07:31:56 +03:00
vuonojenmustaturska
2871b70733 /obj/item var cleanup (#34909)
* draft 1

* Update energy.dm

* Update twohanded.dm

* Update weaponry.dm

* Update ninja_stars.dm

* Update cult_items.dm
2018-01-25 22:44:32 -05:00
Jordan Brown
dfbc1792c2 Merge pull request #34918 from AutomaticFrenzy/patch/armament
Correct spelling of armament
2018-01-25 22:42:27 -05:00
Jordan Brown
b43ec3056e Merge pull request #34915 from Cruix/flipstuff
Fixed the simple rotation component
2018-01-25 22:42:04 -05:00
coiax
8e20aa3f7b Refactors shuttles to be loaded in, rather than be on the station maps (#33766)
* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
2018-01-25 15:18:15 -05:00
vuonojenmustaturska
97d4e59d87 Armor datums (#34793)
* Draft 1

* requested changes

* fixes & refactoring & vv support

* one more vars access

* there we go

* change arg name

* Update lava.dm

* Update armor.dm

* Update armor.dm

* Update armor.dm

* fixes

* Update datumvars.dm

* Update goliath_hide.dm

* Update objs.dm

* 0 -> none in checkrights()

* Update armor.dm

* Update datumvars.dm

* Update armor.dm

* Adds magic armor type

this did not exist before

* two missing things from previous commit

* I shouldn't webeditor at work
2018-01-25 10:27:36 -05:00
Jordan Brown
31fe63bbcf Adds hotspots to chasm blacklist (#34858)
* Adds hotspots to chasm blacklist

* Blacklists landmarks from chasms
2018-01-25 09:10:07 -02:00
Tad Hardesty
1aec3d996d Correct spelling of armament 2018-01-24 18:15:52 -08:00
ExcessiveUseOfCobblestone
8987b18826 Spawns a pen-uplink if you don't have one /w pen pref. (#34827)
* Update mind.dm

* ok togopal i guess you could call that a webedit

* AHHHHHH

* xhuis

* I only had 1 cup of coffee today ok

* dost thou hast storage?

* cb

* we did it... we finally did it.
2018-01-24 19:44:57 -05:00
Ian Turk
1b35873f36 Fixed not being able to rotate anything except in the default rotation direction 2018-01-24 17:35:17 -06:00
XDTM
5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664)
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
Leo
6a5c837583 Merge pull request #34800 from ShizCalev/everybody-was-kungfoo-fighting
martial art sanity check
2018-01-24 18:07:01 -02:00
Ashe Higgs
c05174056d Refactors and nerfs Fleshmend (#34458)
🆑 Xhuis
balance: Fleshmend can no longer be stacked several times at once.
balance: Fleshmend no longer heals changelings who are on fire, and heals burn damage half as quickly as brute and oxygen damage.
code: Fleshmend has been refactored into a status effect.
/🆑

Fleshmend is one of the abilities that makes changelings unkillable combat juggernauts with essentially no counterplay, so I decided to change it:

    First of all, refactored it into a status effect that cannot stack, meaning that only one instance of Fleshmend can be active at once
    Instead of healing 10/10/10 brute/burn/oxy damage, it now heals 10/5/10, emphasizing changelings' weakness to fire
    If a changeling is on fire, Fleshmend will not function at all

This keeps Fleshmend powerful for healing in and out of combat, but adds counterplay to it and gives changelings something to fear: fire. With an extinguisher, they still need to manage their inventory to use it, and even with a fire-immune suit and helmet using the fire on them as a weapon will be unable to use their Fleshmend trump card to outheal any damage they take.

I'll be keeping an eye on changelings after this is merged and adjusting accordingly.
2018-01-25 08:55:53 +13:00
Leo
2e8bc36b5e Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message
Removed named args from visible_message
2018-01-24 15:59:28 -02:00
AnturK
53909747c8 Simple rotation component. (#34476)
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 21:09:15 +13:00
oranges
450278651d Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law
Fix replace_random_law runtime
2018-01-23 20:41:45 +13:00
coiax
cbd5aece90 Fake nuclear disks are even more convincing (#34466)
* Fake nuclear disks are even more convincing

🆑 coiax
add: Fake nuclear disks can only be identified by the captain,
observers, nuclear operatives, seeing where the pinpointer points, or
attempting to put it into a nuclear device.
add: Fake nuclear disks "respawn" on the station just like the real one.
/🆑

- Removes anti-duplication on the syndicate nuke, gets in the way of
testing.

Why? If you manage to pickpocket the Head of Security, steal the disk,
and replace it with a fake, then he shouldn't be able to tell the
difference. Is the disk you're holding real? Maybe you should pop over
to the Vault to check. As a nuke op, leave a fake disk near the very
real, and very armed nuke, as a final taunt to the crew.
2018-01-23 20:40:48 +13:00
Tad Hardesty
1be60a2cd3 Fix replace_random_law runtime 2018-01-22 16:46:46 -08:00
ShizCalev
8acf82ab93 martial art sanity check 2018-01-22 16:42:58 -05:00