Commit Graph

25102 Commits

Author SHA1 Message Date
vuonojenmustaturska c28c53bb1b Proper team integration 2018-04-15 18:43:07 +03:00
AnturK 43d323afff Fixes adjusting brain damage. 2018-04-15 12:17:15 +02:00
John Ginnane 3888041efd Reorganised component controls (#37054)
* Reorganised component controls

* Simplied menu further

Removed "rename" and "copy ref", renamed "remove" to just "-"

* Added similar changes to "built in" components and added "Rename"
2018-04-15 11:30:53 +02:00
ninjanomnom 79217530aa Makes admin loaded shuttles work again 2018-04-15 02:56:07 -04:00
Tad Hardesty 6df32bc38b Correct some pixel_z issues 2018-04-14 20:21:37 -07:00
Jordan Brown 4b2de7a785 Merge pull request #37156 from ExcessiveUseOfCobblestone/patch-38
Stops silicons looping through world every login looking for flippin runes
2018-04-14 22:47:36 -04:00
kevinz000 62a6825ad6 args 2018-04-14 13:50:00 -07:00
vuonojenmustaturska 3b27a1c35d zoinks 2018-04-14 10:57:26 -05:00
Tlaltecuhtli 2570384371 sucessfully fixes some grammar (#37095)
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
2018-04-14 16:12:36 +03:00
shrimpboom8 a175e016f9 Fixes imps all having the same name (#37168)
* Update imp.dm

* Replaced 1 with TRUE
2018-04-14 16:09:36 +03:00
AnturK 66d9a4a0cf Removes /related area variable. (#37173)
* Removes /related area variable.

* area_contents begone

* doorstuff
2018-04-14 12:45:00 +03:00
AnturK ed3ecbbb54 Readds dropped #endif (#37174) 2018-04-13 23:10:56 -04:00
Nich 6756f1fc8f Makes the PI circuit use the PI define (#37161)
* Makes the PI circuit use PI

* I'm a moron :()

* Update arithmetic.dm

* Update arithmetic.dm

* forgot the parentheses

* that's another commit
2018-04-13 20:44:21 +03:00
Dax Dupont 3efe335958 Liver fixes (#37175)
* Rebalances lethality and adds a traitcheck

* Moves borg reagent to other_reagents since these shouldn't do damage at all and are hardly toxins

* Lower it more because this is probably gonna hurt a lot real fast

* Naku's suggestion

derp

Thanks cobby

readds this check

almost nerfed cybernetic livers oops

Aaaaaa
2018-04-13 20:39:47 +03:00
Dax Dupont f2846f6f0a Fixes SCP 194 not using the amount variable. 2018-04-13 09:04:25 -05:00
Jordan Brown 7379c23a7e Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:48 -05:00
Emmett Gaines b831ab50aa Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 15:59:01 +03:00
vuonojenmustaturska 2613699d92 fixes applying KA mods on the minerborg (#37137) 2018-04-13 14:49:14 +02:00
kevinz000 c2709f5e74 Woops. (#37149) 2018-04-13 12:31:42 +03:00
AnturK 2913143102 Fixes conveyors. (#37152) 2018-04-13 12:31:08 +03:00
robbym 53d1a0c3d3 Fixes tile analyzer (#36942)
* Fixes tile analyzer

* Added requested changes

* Changed turf content filter to /obj

* Added loop to add mobs to scan list
2018-04-12 12:49:25 -04:00
Jordie 8485269fc6 Adds round id to server ban messages (#37114)
* adds round id to server ban message

* adds round id to ban denied connection message

* adds round id for legacy ban message

* B

* erroneous space
2018-04-12 12:48:33 -04:00
Grandmother of 50 e8d3746b71 Update login.dm 2018-04-12 08:51:37 -04:00
kevinz000 ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
Grandmother of 50 180f980b79 Changes ore-burning math to avoid decimals (and raise RNG) (#37005)
* Update ores_coins.dm

* I want that to return watson

* Finally a stats course comes in handy...

* Update ores_coins.dm

* Yay mods :)

* pants on head
2018-04-12 13:44:08 +03:00
Emmett Gaines 7dcd690756 Removes some unnecesary vars on shuttles (#37041)
* Removes some unnecesary vars on shuttles

* Forgot to reapply unused transit turf flag
2018-04-12 13:42:03 +03:00
ShizCalev fbdbd51c88 Adds an period to point messages (#37113)
* Adds an exclamation point to point messages

* period.
2018-04-12 12:27:35 +03:00
Jordan Brown a80d9a24cc Merge pull request #37000 from tgstation/KorPhaeron-patch-2
Update compile options to make 512 support official
2018-04-11 16:12:27 -04:00
The_Dreamweaver 7e50e91c3b Fixes order of operations math errors with gas defines. 2018-04-11 15:01:39 -05:00
Denton bba91375ac oof 2018-04-11 14:59:34 -05:00
AnturK a6e8247e98 Fixes brain dna (#37132)
* Fixes brain dna

* Actually fixes the latejoin thing properly.
2018-04-11 14:58:11 -05:00
Denton 0835673c23 adds tesla coil crate 2018-04-11 14:57:17 -05:00
vuonojenmustaturska 8addcd5217 remove 512 version checks 2018-04-11 14:26:22 -05:00
kevinz000 c66bdaf4a2 Fixes interaction memes (#37122) 2018-04-11 21:10:03 +02:00
Winterous f26f7ef7dd Forcing the human liver to actually do its job v2 (#37032)
* Update liver.dm

* Update liver.dm

* Update liver.dm
2018-04-11 17:33:12 +03:00
imsxz a9aa7451d0 fixes #36813 (#37110) 2018-04-11 14:33:01 +02:00
pigeons 40e95fad86 Fixes overlay update for washing bloody hands (#37094) 2018-04-11 14:30:35 +02:00
vuonojenmustaturska 74f67602fd Fixes warp whistle invis bug (#37077)
* Update artefact.dm

* review
2018-04-11 14:28:13 +02:00
Trevor Serpas f0a8f4f53c Integrated Circuits Parameter Fixes (#37073)
Some circuits were missing parameter types allowing players to input values that would no matter what fail. Some of those also had the parameter type wrote into the name to attempt to make it look like the typing was correct however this just made two of the texts saying what type it is apear. Logic gates now output booleans rather than 1's and 0's(purely cosmetic) and had their descriptions updated accordingly.
2018-04-11 15:21:06 +03:00
Emmett Gaines 5dbc037d1d Makes sm delamination have a final countdown (#36977) 2018-04-11 15:10:49 +03:00
Ashe Higgs a2a6c2db96 Disables mood traits when mood is disabled (#37082)
* disables mood traits if mood is off

* my copypasta is showing

* Update negative.dm
2018-04-11 15:04:49 +03:00
oranges 0c02b5004d Revert "Deactivate prescans on suicide" (#37121)
* Revert "Automatic changelog generation for PR #36741 [ci skip]"

This reverts commit e133bb1275.

* Revert "Deactivate prescans on suicide (#36741)"

This reverts commit 309e469f4e.
2018-04-11 13:51:52 +03:00
arsserpentarium 22d845e7fd Fix logic circuits runtime (#37044)
* 1011101 fix fix fix xif xif xif 1011101

* Update logic.dm
2018-04-11 13:23:09 +03:00
Tad Hardesty 80570931d1 Fix various macro consistency problems (#37092) 2018-04-11 13:20:57 +03:00
iksyp 910eb893b9 The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
Grandmother of 50 a5c908a1d3 Provides more control over uplink surplus chances. (#36983)
Cant wait for the epic balance prs that people will fight in
2018-04-11 22:15:55 +12:00
ShizCalev e71af8bc87 Fixes Gr3y.T1d3 delaming the SM (#36925)
Fixes #36841
2018-04-11 22:11:49 +12:00
Robustin 99026a95bf Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791) 2018-04-11 22:07:54 +12:00
george99g 309e469f4e Deactivate prescans on suicide (#36741)
This will just give all of your records a flag on suicide, preventing them from being used to create a clone.

Created suicide_act on /datum/mind to log animal suicides and handle the record deactivation without cluttering up the mob verbs.
2018-04-11 22:04:00 +12:00
oranges a96dc6221a Merge pull request #36693 from kevinz000/patch-471
Slightly bandaid fix for ntnet json/xorencrypt runtimes
2018-04-11 22:01:12 +12:00