Commit Graph

17410 Commits

Author SHA1 Message Date
ExcessiveUseOfCobblestone
ac5bde1a7f Removes Partial Credits for Already Discovered Seeds + MoneyTree Potency Edit (#19975)
* Nerfs Seeds & Money Trees

* give them the D

* REMOVE IT ALL

* Update seeds.dm
2016-08-23 09:06:59 +12:00
Joan Lung
60070e5d2e Merge pull request #20011 from Jalleo/WhatGoofSays
Does what goof says in the solution to a few OP chems
2016-08-22 15:37:52 -04:00
Joan Lung
9a4ae5cd1f Merge pull request #19993 from Ergovisavi/tells_and_readability
Attempts to stop Bubblegum's charge indicator from being wildly inaccurate
2016-08-21 21:52:06 -04:00
Joan Lung
e2d33dd611 Moves a bunch of copypasted megafauna vars to the base type (#19984)
* moves a bunch of copypasted megafauna vars to the base type

* copy pasta

* five more ounces

* hmm why would I do that hmmmmm
2016-08-22 08:48:43 +12:00
Cruix
f406e518cc Fixed some possible runtimes with pollCandidates() (#19919)
* Fixed some possible runtimes with pollCandidates()

* Fixed bug in pollCandidatesForMobs()
2016-08-22 08:45:22 +12:00
blah
b78cf51016 Adds other ones to the blacklist 2016-08-21 20:43:03 +01:00
blah
fffa1b4dc5 Merge branch 'master' of https://github.com/tgstation/-tg-station into WhatGoofSays 2016-08-21 20:00:21 +01:00
blah
8639c60679 One line fix to prevent this admin chem from being seriously duplicated. 2016-08-21 19:54:59 +01:00
AnturK
67fec5891f Merge pull request #19981 from MrStonedOne/TargetPractice
Makes ListTargets() much much faster.
2016-08-21 19:54:54 +02:00
Kyle Spier-Swenson
1440cd8e87 Adds a list() 2016-08-21 10:43:46 -07:00
Cheridan
84522e7573 Merge pull request #19955 from KorPhaeron/auxbasefix
Fixes aux base breaking to space
2016-08-20 23:25:59 -05:00
Jordie
63d17d8a59 Merge pull request #19963 from Shadowlight213/nsmecheck
Adds the ability for admins to lookup the name, ckey and antag status of a player from irc.
2016-08-21 12:22:13 +10:00
Joan Lung
77eac1e009 Merge pull request #17818 from Shadowlight213/Fixbundle
Fixes appearance bans and changes to logout message in check antags
2016-08-20 22:20:38 -04:00
Ergovisavi
16fb2e1571 Attempting to make Bubblegum's charge actually accurate to the on the ground placement 2016-08-20 17:01:58 -07:00
Cheridan
7d9ef1af55 Merge pull request #19970 from Iamgoofball/patch-107
Fixes medigun description
2016-08-20 16:56:47 -05:00
Joan Lung
dc460c518f Merge pull request #19964 from KorPhaeron/config
Replace health config with damage multiplier config
2016-08-20 17:09:01 -04:00
kevinz000
0dc5adf907 dungoofed. (#19979) 2016-08-20 13:20:52 -05:00
MrStonedOne
e9ea58ebf7 Makes listTargets() much much faster.
````
/mob/living/simple_animal/hostile/proc/ListTargetsG    42.008      118.524      118.559       195594
/mob/living/simple_animal/hostile/proc/ListTargetsF    27.078       42.788       42.813       195267
/mob/living/simple_animal/hostile/proc/ListTargetsE    32.423       48.520       48.540       195401
/mob/living/simple_animal/hostile/proc/ListTargetsD    46.633      118.919      118.938       195455
/mob/living/simple_animal/hostile/proc/ListTargetsC    63.589       90.622       90.646       195630
/mob/living/simple_animal/hostile/proc/ListTargetsB    62.156       88.851       88.880       195159
/mob/living/simple_animal/hostile/proc/ListTargetsA   382.978      383.049      383.087       195578
/mob/living/simple_animal/hostile/proc/ListTargets      4.748      895.996      896.142      1368084
````
i went with E because F had a few edge cases that weren't handled correctly.
2016-08-20 06:15:18 -07:00
Joan Lung
b3ba027969 Merge pull request #19958 from lzimann/removespell
Adds remove spell proc to the View Variables dropdown menu.
2016-08-19 20:38:41 -04:00
Shadowlight213
e6146d7739 [S] Fixes deadchat bugs (#19972)
* Fixes an exploit that bypassed deadchat bans.
Adds global deadchat toggle as requested by mso.
Adds some feedback on if dead ooc was turned on or off for admins.

* Fix only
2016-08-19 17:06:08 -05:00
Shadowlight213
c6e6dcb4ef wording fixes 2016-08-19 13:35:10 -07:00
Shadowlight213
0fb4757512 Fixes
Appearance_PERMABAN type removed. now a jobban
Added needed updating to the sql changelog
2016-08-19 13:31:15 -07:00
Iamgoofball
5bc7fbd7f0 MCFLT 2016-08-19 12:12:59 -07:00
Iamgoofball
1818f3781c Fixes medigun description 2016-08-19 12:06:49 -07:00
KorPhaeron
eb39ca8e6e Kinetic Accelerator Mods (#19942)
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
2016-08-19 21:04:25 +12:00
Shadowlight213
98114703e8 Modular computers changes (#19928)
* Fixes and documentation.

* WIp on laptop vendor

* some fixes
2016-08-19 21:03:10 +12:00
Ergovisavi
f163c9e525 Changes to the fulton pack (#19944)
* Consolidated the fulton packs into one pack
* Allows you to fulton yourself by directly attaching it to yourself
* Consolidated the mining voucher fulton kits into one kit
2016-08-18 23:07:33 -05:00
Shadowlight213
5f15792126 Merge branch 'master' of https://github.com/tgstation/tgstation into Fixbundle 2016-08-18 19:47:20 -07:00
Joan Lung
61cff4e7bc Merge pull request #19940 from KorPhaeron/summons
Summon Magic now functions like summon guns
2016-08-18 22:31:02 -04:00
Jordie
8d62df91c3 Readds irradiate failure to nuclear gun on EMP (#19915)
* readds irradiate failure to nuclear gun

* adds overlay proc and bases failure chance to 0
2016-08-18 21:13:12 -05:00
KorPhaeron
074bc50fb4 Damage Multiplier Config 2016-08-18 20:19:19 -05:00
Shadowlight213
1215e02bee Adds the ability to get some info about an inputted ckey or name from irc using the existing keyword_lookup proc.
Also adds a config option to show the names of admins messaging from irc and that they are from irc.
2016-08-18 18:01:06 -07:00
Lzimann
38171aa90a Adds remove spell proc for admins and add it to VV dropdown menu.
The change in
2016-08-18 19:58:16 -03:00
KorPhaeron
4bbfa163dd Aux Base Fix 2016-08-18 16:02:37 -05:00
oranges
205fbc688b Merge pull request #19918 from GunHog/The_Alien_Queen_Bends_Down_And_Plants_A_Kiss_On_WJ_With_Her_Long_Wet_Tongue-mouth
Xenomorph changes and tweaks
2016-08-18 17:28:13 +12:00
oranges
4feb383535 Merge pull request #19904 from ChangelingRain/refusethetrappingsofalifethatwouldseeyoudeadandweaveyourownfromotherpeopleslifegivinglives
Containment fields can no longer contain megafauna
2016-08-18 14:14:45 +12:00
WJohn
b1dc6cd5b7 Adds aux mining base. (#19892)
* First part of fixes and nondescript shit who even reads these

* all done
2016-08-18 12:54:58 +12:00
KorPhaeron
f3200ee88a Summon Magic 2016-08-17 19:33:32 -05:00
Incoming5643
85cc99dc02 Staff of Change 2016 (#19925)
* Staff of Change 2016 Mid year whitelist pull!

It's now possible to turn into a cogscarb in the robot table
It's now possible to turn into a watcher, goliath, headslug, morph, stick man, stick dog, or lesser dragon(!) in the hostile animal table

* you no longer get an achievement for killing the lesser ask drake
2016-08-17 19:30:54 -05:00
Kyle Spier-Swenson
c48db99981 Minor text fixes (#19926) 2016-08-17 14:14:28 -05:00
TechnoAlchemist
9af8023a67 Adds "Jabroni Outfit" to ClothesMate (#19930) 2016-08-17 14:12:04 -05:00
Joan Lung
daf1cab2a8 BLOB HOTFIX 2016-08-17 11:17:27 -04:00
GunHog
e5ecc88536 Merge remote-tracking branch 'remotes/tgstation/master' into The_Alien_Queen_Bends_Down_And_Plants_A_Kiss_On_WJ_With_Her_Long_Wet_Tongue-mouth
# Conflicts:
#	icons/mob/actions.dmi
2016-08-17 09:33:10 -05:00
GunHog
b1acc5ad6e Alien handcuff sprites + New button icons
Aliens now have handcuffed sprites!
Alien buttons have been updated!
2016-08-17 09:23:28 -05:00
Militaires
0bda66c25c Cosmohonk: adds clewn hardsuit (#19931)
* cosmo cosmo cosmohonk

* fixed an eeney meeney miney mo fuckup. thank antur.

* i fucked up a tiny thing and added something to the dme.

so i removed it here using the online editor cause im trash

* Moroccan Salt Preserved Citrus

* it just came out this game is getting some great review

* dun something

* fixes travis

merge this

* verkonne

* desc.
2016-08-17 15:02:34 +02:00
AnturK
601a3df2ff Merge pull request #19916 from optimumtact/dothdefinemylocations
Improves the limb check for the pun
2016-08-17 14:30:05 +02:00
Ergovisavi
8656d3e7eb Adds "Proto-Kinetic Crusher", a melee mining weapon (#19891)
* Mining Hammer

* Adds the mining hammer "Proto-Kinetic Crusher" item
Makes megafauna a little easier to hit in melee
Makes jaunters and Hivelord cores fit in the mining belt

* Fixing a file that should have been untouched
Other miner (geddit) fixes for the mining hammer
2016-08-17 14:29:16 +02:00
Joan Lung
cbf733dbc4 Does something, likely to be important, to blob (#19831)
🆑 Joan
rscadd: Once the blob alert message is sent in the blob game mode, all mobs get to see how many tiles the blob has until it wins, via the Status tab.
rscdel: Removed/merged a bunch of blob chems, you probably don't care about the specifics.
tweak: The remaining blob chems should, overall, be more powerful.
tweak: Shield blobs soak brute damage less well.
tweak: Flashbangs do higher damage to blobs up close, but their damage falls off faster.
experiment: Shield blobs now cost 15 resources to make instead of 10. Node blobs now cost 50 resources to make instead of 60.
experiment: Expanding/attacking now costs 4 resources instead of 5, and blobs can now ATTACK DIAGONALLY. Diagonal attacks are weaker than normal attacks, especially against cyborgs(which may be entirely immune, depending), and they remain unable to expand diagonally.
rscadd: Shield blobs no longer block atmos while under half health. Shield blobs are still immune to fire, even if they can't block atmos.
tweak: Blobs should block explosions less well.
rscadd: Blob cores and nodes are no longer immune to fire and no longer block atmos.
rscadd: Blobs can only auto-expand one tile at a time per expanding thing, and should be easier to beat back in general.
tweak: Blobbernauts now attack faster.
tweak: Blob Overminds attack mobs slower but can attack non-mobs much faster.
rscadd: Blob Overminds start with some amount of resources; in the gamemode, it's 80 divided by the number of overminds, in the event, it's 20 plus the number of active players, and otherwise, it's 60.
bugfix: You can no longer move blob cores into space, onto the mining shuttle, white ship, gulag shuttle, or solars.
bugfix: Blob rounds might be less laggy, if they were laggy?
tweak: Blobs don't heal as fast, excluding the core.
experiment: Blobs are marginally less destructive to their environment.
/🆑

Objective:
maybe possibly make blob something you can fight instead of wishing the blob didn't exist?
but also make the blob lethal enough that it can still deal with the crew if it knows what it's doing(and still lose if the crew is good instead of snowballing forever)
2016-08-17 15:48:28 +12:00
oranges
5fa249f97e Merge pull request #19729 from Shadowlight213/bayputers
[Review Ready] Ports baystation's modular computers
2016-08-17 13:23:51 +12:00
Iamgoofball
b5b55abb6e Dixon Buttes XXXXIV (#19857)
* Dixon Buttes XXXXIV

* Update chameleon.dm

* Sometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopter

Sometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopterSometimes I whip my weiner around in circles hoping to get it going fast enough to fly away like a helicopter
2016-08-17 10:10:26 +12:00