Commit Graph

18320 Commits

Author SHA1 Message Date
Pieter-Jan Briers
f551362663 Fix some incorrect xenoarch distance values. (#26030) 2020-03-23 09:33:46 -03:00
Kurfursten
bf8307f593 Revert "Make the blast cannon a bit better (#25800)" (#25945)
This reverts commit 22754548e8.
2020-03-22 22:07:15 -05:00
Pieter-Jan Briers
80030deeef Fix strange rocks spawning so damn much. (#26027)
Fixes #26018
2020-03-22 19:00:47 -03:00
ArchSunder
0bc079e9ca Adds a lollipop synthesizer to mediborgs (#26004)
* Lollipop synth as child of cookiesynth

* Adds lollipop synth to medborg modules

* something

* used space instead of tab cus im a fuckin retard

* Added lollipop synth to syndicate medborg

* i made a child of lollipops but i dont know if this actually works

* adding lollipop child to synth module, again no idea if this works

* hmmm today i will copypaste code

* hmmm

* people think its hard to watch people be retarded but nobody thinks about the difficulty about having to BE retarded

* god fuck shit

* butts

* oops

* toxin machine broke

Co-authored-by: ArchSunder <twwork11@hotmail.co.uk>
2020-03-22 11:53:06 +01:00
Pieter-Jan Briers
a3a8c9d97c Xenoarch overhaul/rework thing. (#26005)
* Xenoarch overhaul/rework thing.

Cuts out a bunch of stupid crap from xenoarch in the interest of making it less painful and less confusing.

Fixed stupidity in the find excavation code so it's actually possible to 100% reliably dig stuff up cleanly.

Suspension field generators are no longer necessary and have been removed from all maps. They can still be bought from cargo because you can use them on people and jkn would kill me if I removed that.

You no longer need to heat density separated sample when processing samples. As soon as you mix the lithium sodium tungstate with the ground rock you can throw it into the analysis machines. This makes it *significantly* more streamlined to process samples and also means you aren't basically forced to use a laser scalpel to get anything done.

Distances have all been fixed to be 100cm instead of 200cm per tile.

RP spectrometry machines have been removed and the space on the maps has been replaced with some free space so do whatever with it. As an extension of this I re-mapped the outpost-y sections of roid a bit so that the anomaly/sample lab have the HI/FTS because they were previously in the spectrometry lab.

Fixed artifact destructions not correctly being logged in all cases.

Moved the digsite locator to its own file.

Also fixes #25854

* Forgot to commit roid

* Update excdrill not correctly being divided by 2.

* 1cm brush.

* Typo
2020-03-20 13:24:46 -03:00
ShiftyRail
be02730173 Nothing to see here (#26001) 2020-03-16 20:07:54 -05:00
RealestEstate
ed4fa0136a Summon Pitbulls (#25883)
* adds pitbulls and a conjure pitbull spell

* spell icon

* removed testing obj

* Treachery mechanic, code touch up, and pitbull bark

* removes the limiters, couldn't figure it out after 3 weeks fuck me

* fix merge conflict

* merge fixaroo this shit is like magic

* re-adds pitbull icons

* someday I will fix this merge conflict

* but not fucking today apparently

* removes a pointless comment

Co-authored-by: Acrylic Mimosa <>
2020-03-10 20:26:35 -05:00
d3athrow
78eee313b5 Merge pull request #25966 from ancientpower/vampire-killer
Vampire hunter clothes for chaplains + whip changes
2020-03-10 04:41:04 -05:00
ancientpower
8bd0d00ed8 damage number tweak 2020-03-09 18:42:59 -05:00
ancientpower
a1e6277c59 vamp hunter religion 2020-03-09 18:39:01 -05:00
ShiftyRail
1a6bbfe99f Fix Honk serum overdose (#25967)
* Makes Honk Serum overdose break miming.

* '

* Aaah
2020-03-09 12:02:59 -05:00
Pieter-Jan Briers
018be1cff0 Xenoarch Core Sampler fixes (#25962)
Cleaned up the code to be less awful.
Fixed "can't re-insert bags into core sampler"
Fixed examine text always listing it as empty.
Fixed the bags sprite not correctly clearing when you empty them.
Made a subtype of evidence bag for the core sampler.
Fixed a while bunch of formatting problems too probably.

Fixes #25631 fixes #25629 fixes #24973 fixes #22579 fixes #20515
2020-03-09 06:40:03 -03:00
adrian
b85931a354 More hard dels (#25977) 2020-03-08 14:20:50 -05:00
ancientpower
5236d3ee00 smaller icons and tweaked damage 2020-03-06 12:15:28 -06:00
DamianX
02039b9664 Revert "Revert "meme away (#25936)" (#25939)" (#25958)
This reverts commit 4acf7e3a67.
2020-03-06 13:02:17 -03:00
ancientpower
57181b2049 whoops 2020-03-05 22:38:17 -06:00
ancientpower
afb68b5906 whip changes 2020-03-05 22:34:06 -06:00
Kurfursten
bad2a205f7 Unretards the vector (#25940)
* Unretards the vector

This adds the following to the stock vector receiver's blacklist
-Gyrojet mags
-Uzi mags (just .45 but with more bullets)
-.45 pistol mags
-.50 mags
-762 mags (behead those who merged this shit)
With this the vector should stop being gunk and can enjoy a nice niche  as the burst fire vector which is pretty ok imo.

* colorful warning for future aspiring coders
2020-03-05 00:32:50 -06:00
DamianX
4acf7e3a67 Revert "meme away (#25936)" (#25939)
This reverts commit b99d761318.
2020-03-03 09:00:54 -03:00
boy2mantwicethefam
24aad3e3ca runtimes (#25955) 2020-03-02 20:13:29 -03:00
ShiftyRail
f92eee6099 Makes Honk Serum overdose break miming. (#25941)
* Makes Honk Serum overdose break miming.

* '
2020-03-02 16:17:33 -06:00
Exxion
af16a66a53 Fixes botany some more (#25953)
This is exactly what I thought might happen, and yet it didn't occur to me that it was what was happening. Fascinating.
2020-03-02 11:24:03 -06:00
Irradiation
3ccceb090a Renamed every instance of "plastique" (c4 explosives) to "c4" (#25924)
* Renamed every instance of "plastique" (c4 explosives) to "c4"

This is in the name of every admin out here and anybody doing testing. Fuck you old c*ders.

* fuck you plosky and old test map nobody uses

* PLOOOSKKYYYYY
2020-02-28 23:36:43 -06:00
Exxion
dedf8edced Fixes botany (#25938)
Consequences: Still unforeseen
2020-02-28 23:35:48 -06:00
DeityLink
b99d761318 meme away (#25936) 2020-02-28 20:13:56 -06:00
cloutcode
24332f4caa why didn't you merge mine first my pr was first bro not cool (#25898) 2020-02-26 19:10:37 -03:00
Kharkov72
558f8e446b Adds Mushman Babies and Diona Nymphs as possibilities to the infestation random event (#25917)
* nymphtide worldwide

* pinhead
2020-02-26 15:39:33 -06:00
ShiftyRail
d3f79249f0 Fixes viro UI problems, make the medical computer file more readble (#25905)
* Made the .dm file readable in VSCode

* Format

* Actually fixes it
2020-02-26 12:06:28 -06:00
Allspice
67a1eae356 Adds the NATO phonetic alphabet as a default language for deathsquads. (#25835)
* Adds the NATO phonetic alphabet as a language for deathsquads.

* Change deathsquad language key to &
2020-02-26 12:04:45 -06:00
SonixApache
3e31e6aaac fixes bedsheet layering when buckling to beds (#25868)
* fixes bedsheet layering

* Update code/modules/mob/living/carbon/human/human.dm

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2020-02-26 12:01:42 -06:00
ShiftyRail
078d01c0d1 Fixes rocknuts potency not scalling (#25904)
* Fixes rocknuts potency not scalling

* Fixes

* DOH

* What could go wrong
2020-02-26 11:58:37 -06:00
Buchse
4e93c9b739 Adds cassocks to the chapel vendor (#25911)
* Adds a cassock to the chaplain vending machine

* should fix conflicting files with the fat sprites
2020-02-26 11:56:42 -06:00
Exxion
d7f9bac43c Thermoelectric Coolers (#25837)
* TEC v1

* TEC radio, etc.

* Buff a bit

* TEC stuff again
2020-02-26 11:37:49 -06:00
yackemflam
22754548e8 Make the blast cannon a bit better (#25800)
* Make the blast cannon a bit better

Make the choice to focus your blast to a single tile in width a spicier one

* Update blastcannon.dm

electric boogaloo
2020-02-26 11:33:56 -06:00
D3athrow
523c8e97d4 Makes polls marked as hidden not show up in game. 2020-02-25 13:01:47 -06:00
boy2mantwicethefam
8bbfd9ba75 Fixes corn oil and makes robotic hearts immune to it (#25889)
* corn oil fix

* removes a src., adds second check for robotic heart
2020-02-24 19:40:56 -03:00
RealestEstate
89d87f6aff More PAI foods (#25865)
* more PAI foods

* forgot to add files

* removing fun yet also creating pai toast
2020-02-24 19:39:40 -03:00
jackfailure
1404fc5de4 The Fattening (#25874)
* Add files via upload

* Revert "Add files via upload"

* Suit and Uniform for fatties

Adds a whole host of security, wizard, and greaser sprites for fatties.

* Updated Fat Suits

* Added fat compatability

* Fat Jensen

* Fat brits and greasers

* Fat chefs and mimes

* fat radsuit

* Fat Wizards

* Fat Suits and Fat Uniforms

Adding a two dozen or so new sprites.
2020-02-24 19:35:51 -03:00
ShiftyRail
93e93cbaa6 Laser tag custom games! (#25806)
* WiP

* MORE content

* erf

* Edition mode

* Bugfixes, var names changes, fixes, changes, fixes

* Formatting
2020-02-23 18:59:54 -06:00
GermanSanta
f25fa00991 Clown Psychedelic Goblin (#25832)
* honk

* Update carbon.dm

* Hehe~

* Update admins.txt

* Hmm

* Push

a

* Delete admins.txt

* please fix lmao

* comdom
2020-02-21 18:53:05 -06:00
9percents
4a8a55c3fa Hidden SMG Briefcase now houses an uzi and a bit more (#25840)
* better, stronger, more_ammo and looks nicer

* cleans untrackable stuff that is plugging space
2020-02-20 16:51:34 -06:00
Irradiation
c1c6a8191e Buffs the plates for the plate carrier (#25838)
* Buffs the ballistic & laser plates for the plate carrier

* updoot

* ceramic plates now

* minor changes for cross-damage types for specialized plates

* more updoots to ceramic
2020-02-20 12:53:47 -06:00
ShiftyRail
b8482b1869 Fixes mutual handcuffs z-transition logic (#25825) 2020-02-20 12:51:24 -06:00
boy2mantwicethefam
26176fad4b Silicon movement parity now scales with the cell's capacity if the capacity is low enough (#25807)
* not so much math after all

* desc

* tested
2020-02-20 12:33:34 -06:00
boy2mantwicethefam
d4595475a4 Update retard.dm (#25849) 2020-02-20 12:31:58 -06:00
boy2mantwicethefam
81d788d5d4 the return of brain damag involatucoiin the brain the brian bran diamaig invoccti omnn oj the rcminvot invociation invot incotvatoion hhe the return of brian brain the return of brain dmag dmage dmagmage the return of bria the return of bri the return of brain damage invoCV THE RETURN OF BRAIN DAMAGE INVOCATIONS (#25850) 2020-02-20 12:31:16 -06:00
yackemflam
89dadf53a3 Too much corn oil can give you a heart attack (#25814)
* Too much corn oil can give you a heart attack

Quit frying/eating so much fried foods you slobs

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm
2020-02-19 08:44:31 -03:00
Buchse
a3c046ba06 typo (#25871) 2020-02-18 18:28:32 -06:00
SonixApache
d47fed6354 adds lollipops (#25857)
* adds lollipops!

* line comments

* better size

* better reagent system

* line comments & recycle value

* species sprites
2020-02-18 18:44:28 -03:00
Buchse
b6c24e377c Added sprites and code for species alts (again) 2020-02-17 04:02:25 -05:00