Commit Graph

10683 Commits

Author SHA1 Message Date
ThePainkiller 2bc1baed36 Spellcheck: Fixed a typo on holy_weapons.dm (#34561) 2018-01-18 17:45:29 -05:00
Leo 517f86ba76 Merge pull request #34533 from Buggy123/patch-56
Fixes integrity value for non-reinforced plasma window
2018-01-18 10:10:11 -02:00
deathride58 0c282b8865 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916)
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
2018-01-17 12:17:25 -05:00
Buggy123 4ff5196a07 Fixes integrity value for reinforced plasma window 2018-01-17 02:56:08 -05:00
oranges f065ee0098 Merge pull request #34378 from nicbn/yarr
Pirates are now skeletons
2018-01-17 09:34:07 +13:00
oranges 7fe928d11a Merge pull request #34468 from ShizCalev/redundant-trim
Cleans up some redundant stripped_input usage
2018-01-17 09:32:00 +13:00
oranges afd92a5b12 Merge pull request #34464 from uraniummeltdown/dumbcult
Removed the dumb iscultist() check in runed metal's attack() proc
2018-01-17 09:31:15 +13:00
kevinz000 6ebc926f00 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-17 09:30:14 +13:00
oranges 5adf17bf4a Merge pull request #34413 from kevinz000/patch-430
Allows C4 on mobs again
2018-01-17 09:27:09 +13:00
oranges b979a01711 Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement
Fix RPD embedding fixtures inside lattices and girders
2018-01-17 09:26:11 +13:00
Jordan Brown 603cc77136 Merge pull request #34475 from ShizCalev/internals-metal
Makes tanks made of metal
2018-01-16 09:33:19 -05:00
Jordan Brown 3a3c692d0d Merge pull request #34491 from Xhuis/the_lightbulb
Adds a new bar sign, The Lightbulb (take 2)
2018-01-16 09:27:14 -05:00
AnturK 332e7ca474 Makes getFlatIcon slower. (Also more precise) (#34199)
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
2018-01-16 08:32:35 -05:00
uraniummeltdown 8d5030f3a7 rename all 'clown' to 'bananium' for bananium mineral objects (#34462) 2018-01-15 23:02:18 -05:00
kevinz000 1ee607fc2d Fixes mat container + emags (#34449) 2018-01-15 21:57:52 -05:00
Tad Hardesty a9ced2ddcf Fix RPD embedding fixtures inside lattices and girders 2018-01-15 17:26:48 -08:00
XDTM 76b5ee3966 Xenobiology Species Rework (#34166)
I've always found grating that xenobiology had access to species they had no business working with, and slime magic can only explain so much. My idea is to separate those species into their respective departments/antags, instead of having them all into a centralized, cheap source.

    Androids should be made by robotics through augmentation
    Podpeople are a botany feature
    Skeletons should be limited to liches or other magic antags
    Zombies should stay limited to romerol
    Golems are still available in adamantine slimes (and luminescents can morph into golems with them)
    Shadowpeople still lack an official place, but luminescents can become shadowpeople with black cores

The basic races are mostly human and lizard, and there are mutation toxins for those in case someone wants their species back after bodyswapping/ling mutation sting/etc.
2018-01-16 11:07:06 +13:00
oranges 11f6544f35 Merge pull request #34489 from ShizCalev/lightbulbrevert
Revert: Adds the Lightbulb bar sign (#34480)
2018-01-16 10:48:53 +13:00
MoreRobustThanYou 9ab6865f87 Greyscale wirecutters (#34385)
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
2018-01-15 16:15:58 -05:00
ShizCalev ebf519cdee Adds the Lightbulb bar sign (#34480)
(reverted from commit da1e14c107)
2018-01-15 16:08:46 -05:00
Ashe Higgs da1e14c107 Adds the Lightbulb bar sign (#34480) 2018-01-15 16:06:08 -05:00
Xhuis 74fb50d509 Adds the Lightbulb bar sign 2018-01-15 14:36:56 -05:00
ShizCalev 9c859dc289 Makes tanks made of metal 2018-01-15 12:45:08 -05:00
ShizCalev 18c0928903 Redundant params 2018-01-15 10:22:58 -05:00
ShizCalev b41322baad Cleans up some redundant trims 2018-01-15 10:19:12 -05:00
uraniummeltdown 309b39cdba removed the dumb iscultist() check in runed metal's attack() proc 2018-01-15 17:56:58 +05:00
ShizCalev 42df595372 Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 10:01:22 +01:00
John Ginnane 2587222509 Fixed alt-click not working with stacks (#34396)
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
2018-01-14 23:04:18 -05:00
Iamgoofball 7f07d82de4 Rocket Pods now require manual disassembly (#34374)
Bluespacing out simply wasn't metal enough tbh
2018-01-14 22:58:58 -05:00
kevinz000 a50f1529a3 Update plastic.dm 2018-01-14 11:38:05 -08:00
ShizCalev 3d08996463 Replaces cached get_area vars for names (#34338) 2018-01-13 21:55:47 -05:00
Leo ac81f6aa91 Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime
Fix RPD runtimes and offsets of layered connector ports
2018-01-13 12:58:00 -02:00
oranges 30ea4d1a38 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 23:21:58 +13:00
oranges b7acfbbfc0 Merge pull request #33699 from QualityVan/safedestruction
Makes vault safe slightly less explosion-proof
2018-01-13 23:16:13 +13:00
nicbn 6dc388a102 Pirates are now skeletons 2018-01-12 21:13:23 -02:00
Leo 3654846d25 Merge pull request #34316 from tgstation/Cyberboss-patch-4
Fixes poker tables not being deleted after Narsie touches them
2018-01-12 16:30:06 -02:00
Tad Hardesty 517ef9095a Fix RPD runtimes and offsets of layered connector ports 2018-01-12 06:08:10 -08:00
JJRcop 1b1287e009 Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 11:03:28 -02:00
Leo 307581c195 Merge pull request #34282 from Cyberboss/ClosetFix22
Fix hitting closets with wrenches
2018-01-11 21:11:30 -02:00
kevinz000 f27948eaa3 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164)
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
2018-01-12 09:09:57 +13:00
arsserpentarium c86fc91b55 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-12 09:02:56 +13:00
oranges 277c2bbf65 Merge pull request #34206 from ShizCalev/fireaxe-drop
Fixes twohanded weapons not unwielding when you lose an arm.
2018-01-12 09:01:46 +13:00
Jordan Brown 49e94049b5 Fixes poker tables not being deleted after Narsie touches them 2018-01-11 12:20:05 -05:00
Jordan Brown f574635356 Fix hitting closets with wrenches 2018-01-10 17:08:10 -05:00
Jordan Brown 91739c6aa5 Removes custom AI board no laws warning (#34226) 2018-01-10 19:46:55 -02:00
Leo c541007bf1 Merge pull request #34209 from ShizCalev/defib-icon-fixes
Fixes missing defib inhands
2018-01-10 10:54:35 -02:00
Goodstuff 40e7cb74ba Update twohanded.dm (#34139) 2018-01-10 10:50:57 +01:00
ShizCalev b78951009b Fixes buckled message spam for ghosts inside talking scythes (#34111)
* Fixes buckled message spam for ghosts

* params
2018-01-10 10:46:56 +01:00
Robustin c906c17178 Fixes reflections (#34065)
File this under "how did nobody notice this shit for so long?" Currently reflections basically have the projectile pass through you like you're a piece of glass, which ruins one of its most important traitors (protecting people behind you/putting the shooter in danger.

Also energy shields are a meme and literally cannot block anything, instead of sparking a balance debate im just fixing the description so nobody gets duped.
2018-01-10 19:04:14 +13:00
oranges fcc3dae19a Merge pull request #33436 from MrDoomBringer/DropItLikeItsHottest
For too many years, Cargonia has been oppressed, depressed, and re-pressed, by the slow and cumbersome movement of the supply shuttle. After hours of begging and pleading around on coderbus, I can present to you the ultimate cargo utility.

This update adds room for a certain level of progression with cargo, allowing for extra money to be spent on extra-fast delivery times. The drop pod itself picks a random, unblocked turf in the cargobay, then crashes down upon it, creating a small explosion and damaging some tiles.

The explosion exists to act as a secondary act of balance: the drop pod is intended to be used for a few VIP deliveries. Ordering in bulk will still require use of the shuttle, unless you are prepared to fix the shit out of an explosion-riddled cargo.

Because of the nature of the mechanic, it is very easy to spend a lot of money very quickly. For this reason, a separate console was created: so that it could be placed in the safety of the Quartermaster's office, away from the sausage fingers of incompetent greyshits and rookie cargotechs.
2018-01-10 12:06:39 +13:00