9dfeb83ebd
others
2018-02-10 15:24:58 -05:00
09ddb0000c
Fixes wrong ID for syndicate ghost roles
2018-02-10 14:06:32 -05:00
f5ff686404
Merge pull request #35424 from ShizCalev/var-cleanup
...
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
99c1a11e5d
Merge pull request #35479 from Cruix/chem_collisions
...
Fixed chemical recipe conflicts
2018-02-10 12:04:18 -05:00
db5173f896
Integrated Circutry Readability Improvements ( #35449 )
...
* Integrated Circutry Readability Improvements
* support for old save files and fix a var I missed
2018-02-10 11:04:34 -05:00
7470e79c2c
Switched nitrogen for ethanol in morphine recipe. ( #35437 )
...
* Fixes Ordo not testing shit properly
* Lowers yield for balance purposes
Fug
2018-02-10 11:00:01 -05:00
da961200f0
Fixes button lock not saving ( #35465 )
2018-02-10 10:58:06 -05:00
8bfe0df2dd
Removes uneedful code
2018-02-09 14:23:00 -06:00
4b75dd8b50
Hatchets are now small instead of tiny.
2018-02-09 14:22:24 -06:00
9eaa717778
Cell blueprints now use the /empty variants ( #35463 )
...
* Cell blueprints now use the /empty variants
* Add empty stock cell
2018-02-09 13:50:19 -05:00
54caf8b21a
Merge pull request #35452 from 81Denton/crush-a-can-for-jay-owen
...
Removes grind_results from empty soda cans
2018-02-09 09:44:19 -05:00
63a7018fb5
Merge pull request #35453 from 81Denton/aluminium-with-two-i
...
Aluminium with two i
2018-02-09 09:44:10 -05:00
ebcac584df
Merge pull request #35454 from DaxDupont/You-didn't-have-to-smile-at-me,-Your-grin's-the-sweetest-that-I've-ever-seen,But-you-did.-Yes-you-did
...
Adds defib to techwebs
2018-02-09 09:43:43 -05:00
1c656f0e08
Merge pull request #35446 from 81Denton/can-synth
...
can_synth uses TRUE/FALSE
2018-02-09 10:41:15 +02:00
9131022a9a
Merge pull request #35476 from AutomaticFrenzy/patch/goliath-hide
...
Fix goliath hide plates not applying to suits correctly
2018-02-09 10:26:13 +02:00
f7fe600540
Cleans up vars with defines
2018-02-09 00:20:41 -05:00
724719c34a
Merge pull request #35405 from MrStonedOne/fixterry
...
Fixes job exp updates hounding the database more than it needed to.
2018-02-09 00:05:27 -05:00
ca3976fc1d
Merge pull request #35435 from optimumtact/mrtyhasahorsecunt
...
Revert "Adds the saltmine shuttle. (#35369 )"
2018-02-09 00:03:36 -05:00
e6ba6e17cf
Fix goliath hide plates not applying to suits correctly
2018-02-08 19:08:58 -08:00
a524466853
Fixed chemical recipe conflicts
2018-02-08 19:36:11 -06:00
7dee5379d7
Cult fixes and UI improvement ( #35178 )
...
* Blood spell fixes and UI improvement
* Bastard sword bug
* Update blood_magic.dm
* woops parenthesis
* Update blood_magic.dm
* space
2018-02-09 14:10:50 +13:00
a3d9133016
Merge pull request #35419 from kevinz000/patch-446
...
fixes beam rifle zooming
2018-02-08 16:18:29 -05:00
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
1c8e450f15
Fixes geiger counters on engiborgs ( #35423 )
...
* a commit
* Update geiger_counter.dm
2018-02-08 12:21:06 -05:00
7a06bcb4a0
removes grind_results
2018-02-08 16:42:03 +01:00
8490b1560a
Adds defib to techweb
2018-02-08 16:22:38 +01:00
6b90cc824a
Merge pull request #35410 from ShizCalev/ai-loc-fix
...
Fixes primary AI spawning at incorrect locations
2018-02-08 10:04:33 -05:00
211dd43a68
Merge pull request #35412 from DaxDupont/flags-are-for-fags
...
Brings certain designs in line with others.
2018-02-08 10:03:51 -05:00
fa4dce2943
part 2
2018-02-08 15:43:44 +01:00
24d60d8f32
corrects aluminium
2018-02-08 15:32:27 +01:00
718e50548e
true/false
2018-02-08 11:16:20 +01:00
10a24645c6
Adds basic trailer support to vehicles ( #35388 )
...
* Adds basic trailer support to vehicles
* Move compat.
2018-02-08 22:21:42 +13:00
fc3ad5dc66
SM can explode on space tiles again ( #35275 )
...
* Reordered some of the SM logic
* make it a little slower
* It does not explode instantly i tested
2018-02-08 22:12:56 +13:00
31c973f38c
Circuit drone + grabber/thrower balance changes ( #34834 )
...
* makes grabbers bulky and inventory max bulky
* makes circuit drones bulky
* removes drone stacking
* made grabbers max w class based on drone assembly, changed their w class back to small
* review stuff
* makes throwers max_w_class depend on assembly size
* uh
* kills sheer heart attack
* fuck off
* FUCK
* GR
2018-02-08 22:10:48 +13:00
a0624c5909
Merge pull request #35346 from DaxDupont/kinky-cuffs
...
Fixes cyborg related cuffing issues
2018-02-08 22:07:07 +13:00
1c42a8186a
Heart Disease 2: Electric Boogaloo ( #35296 )
...
* Heart Disease 2: Electric Boogaloo
* Upd8
2018-02-08 22:01:55 +13:00
4f2352e1d2
Merge pull request #35401 from MrStonedOne/patch-475
...
[s]Closes exploits in proc calling admin rank datum procs.
2018-02-08 21:53:58 +13:00
90e204105c
[s]Closes exploits in proc calling admin datum procs. ( #35399 )
...
* Closes exploits in proc calling admin datum procs.
There is likely one in ranks, but that can be its own pr.
* Update holder2.dm
2018-02-08 21:53:43 +13:00
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
b1f301b39b
Revert "Adds the saltmine shuttle. ( #35369 )"
...
This reverts commit c7ee29b5b0
2018-02-08 01:49:57 +00:00
dc862ad931
Var cleanup and map fixes
2018-02-07 17:10:22 -05:00
b9de200c67
user dropping
2018-02-07 08:06:48 -08:00
7faad2e7e8
Brings certain designs in line with others
2018-02-07 15:36:43 +01:00
96b9e5bf88
balances the netherworld link, spawners can now spawn from a pool of mobs, and the netherworld link can now summon all three types of netherworld critters. (and mining spawner cleanup for admin events i guess) ( #35386 )
...
* woah totally wacky wazoo
* OH I'M SAYIN IT
* donezo now lets do the rest lol
* commiting this so i can revert back to it when nobody likes my changes past this point
* 🙏
* jesus
* christ
* move'd
2018-02-07 16:12:47 +02:00
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
7fa0f51abf
Fixes job exp hounding the database more than it needed to.
...
There is no need to select the current values if we make sure to use the right operations.
Next on my list is a more generic batched sql system that can do things like select rows based on a list of primary keys, using one query (by abusing the in keyword) as well has abtract away the need to directly do overriding add_timers.
2018-02-07 03:57:15 -08:00
64862f285b
Merge pull request #35258 from kevinz000/patch-441
...
Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 13:39:48 +02:00
e264c15aac
Merge pull request #35385 from AnturK/custoantagfixup
...
Fixes custom antags for random event morph/slaughter demon.
2018-02-07 13:22:38 +02:00
6f7e89f07f
Holopictures and more! ( #35303 )
...
* Holopictures and more!
* Remiedation
2018-02-07 13:16:44 +02:00
6c0f6fbf4a
Prevents fungal TB spores from being synthesized ( #35381 )
...
* can_synth 0 for fungal TB
* 0 -> FALSE
2018-02-07 12:57:01 +02:00
ShizCalev
Jordan Brown
Trevor Serpas
Ordonis
Ashe Higgs
Dax Dupont
vuonojenmustaturska
Tad Hardesty
Ian Turk
Robustin
PKPenguin321
81Denton
Iamgoofball
Evsey Antonovich
oranges
MoreRobustThanYou
Kyle Spier-Swenson
MMMiracles
kevinz000
Armhulen