Commit Graph

29312 Commits

Author SHA1 Message Date
Anewbe
c5bd6e7526 Merge pull request #6254 from Heroman3003/farmbotfix
Fixes farmbot infinite looping
2019-07-03 12:09:49 -05:00
Anewbe
4e711c4399 Merge pull request #6259 from Heroman3003/flowerfix
Fixes ppflowers having no icon sometiems
2019-07-03 12:09:11 -05:00
Anewbe
b5694b7bfb Merge pull request #6261 from Heroman3003/botanfix
Fixes atmosphere targeted mutation editing wrong plant traits
2019-07-03 12:09:03 -05:00
Anewbe
be5413ad10 Merge pull request #6253 from Heroman3003/invisible-wall-fix
Fixes deconstructed wall frames blocking passage
2019-07-02 07:27:47 -05:00
Anewbe
8f7008838d Merge pull request #6251 from Heroman3003/reactionfix
Fixes retaliate mobs ignoring melee attacks
2019-07-02 07:27:19 -05:00
Heroman
2da1f5b0e0 Fixes Atmosphere targeted mutation editing wrong traits 2019-07-02 16:05:32 +10:00
Heroman
1a64480516 Fixes ppflowers having no icon sometiems 2019-07-02 11:23:52 +10:00
Atermonera
1931839588 Merge pull request #6250 from Heroman3003/altclickup
Allows to interact with turf itself in Turf tab
2019-07-01 16:47:46 -08:00
Atermonera
f158e1b75f Merge pull request #6249 from Heroman3003/lead-stack
Makes lead icon display stack
2019-07-01 16:47:18 -08:00
Atermonera
7fe38b397f Merge pull request #6248 from Heroman3003/gpsing
Adds more GPS variety
2019-07-01 16:46:52 -08:00
Atermonera
900be3a092 Merge pull request #6247 from mistyLuminescence/zruntime
Fixes runtime and GPS problem with invalid Z-levels
2019-07-01 16:45:44 -08:00
Atermonera
c8b2c08aa3 Merge pull request #6120 from Mechoid/MultiTile
Multi-Tile Objects, Multi-Tile Hovershuttle
2019-07-01 16:43:09 -08:00
Heroman
44755ae3de Fixes farmbot infinite looping 2019-07-01 17:42:53 +10:00
Heroman
9b4d6f939a Fixes deconstructed wall frames blocking passage 2019-07-01 17:33:21 +10:00
Heroman
2526df73e2 Fixes retaliate mobs ignoring melee attacks 2019-07-01 16:36:46 +10:00
Anewbe
3e8d0c2df3 Merge pull request #6246 from Heroman3003/lightfix
Fixes construction of lights
2019-06-30 18:39:50 -05:00
Heroman
88eee11c60 Allows to interact with turf itself in Turf tab 2019-07-01 09:33:08 +10:00
mistyLuminescence
2ec54f0151 Adds two new Cargo crates! (#6194)
* Adds 2 new cargo crates
2019-06-29 16:45:46 -07:00
Anewbe
a12f244df3 Merge pull request #6244 from Heroman3003/cargofix
Fixes glucose crate spawning
2019-06-29 18:26:05 -05:00
Heroman
db762ecb45 Fixes lampshade duping 2019-06-30 06:43:22 +10:00
Anewbe
5ffd8dbbee Merge pull request #6238 from Heroman3003/broken-components
QoL improvements for broken components
2019-06-29 03:08:12 -05:00
Heroman
f6a46a6769 Makes lead icon display stack 2019-06-29 17:07:16 +10:00
ElectricB1ue
e9cc7c71ea Adds two new alternate sprites for the detective's revolver. (#6230)
* Adds the sprites

* This should do things.
2019-06-28 20:22:19 -05:00
Andrew
be96de8a3e Adds Material Scanner to Protolathe (#6235)
* Adds Material Scanner to Protolathe

Adds the optical material scanner to the protolathe (the ones miners get).
Costs 50 steel and 50 glass (same as all the other HUDs)
Required tech is 3 magnet and 3 engineering (same as on the HUD)

Also adjusts the meson design so it actually uses its parent code like the other HUDs

* Changes sorting string
2019-06-28 20:21:29 -05:00
Anewbe
84b1a6dedf Merge pull request #6236 from Nalarac/patch-3
Adds Precursor Tech to Research Debugging Device
2019-06-28 20:21:02 -05:00
Mechoid
39f9fb62f7 Adds Industrial turrets, and an industrial teleporter defense turret. (#6233)
* Starts work on retouching the Teleporter.

* Fix icon.
2019-06-28 20:20:38 -05:00
Heroman
090a4fa7b0 Adds more GPS variety 2019-06-29 10:53:02 +10:00
Atermonera
df6c91dd5a Merge pull request #6234 from Cerebulon/newsJune19
Feb-June News Update
2019-06-28 16:11:41 -08:00
if there were two guys on the moon
2f710a202f Fixes Z-level fuckery 2019-06-29 00:16:15 +01:00
Heroman
973779f4ba Fixes construction of lights 2019-06-29 07:00:02 +10:00
Heroman
1f3dc1a6ee Fixes glucose crate spawning 2019-06-29 04:14:55 +10:00
Heroman
896897a398 QoL improvements for broken components 2019-06-28 19:33:35 +10:00
Andrew
efe63b90ac Adds Precursor Tech to Research Debugging Device 2019-06-27 13:24:28 -05:00
Cerebulon
57106d3c12 Adds news articles since January to the newscaster. 2019-06-27 07:19:10 +01:00
Heroman
e60772da0c Fixes ghost jump-to-mob 2019-06-26 08:50:42 +10:00
Atermonera
8b14c49d52 Merge pull request #6226 from SubberTheFabulous/MonitorFix
Makes some alt. roboheads actually use their monitors
2019-06-24 11:23:41 -08:00
Atermonera
1efb2353db Merge pull request #5842 from Anewbe/language_buffs
Blindly adds partial cross-language intelligibility
2019-06-24 11:21:36 -08:00
Anewbe
64b8f60b43 Merge pull request #6224 from MagmaRam/IC_input_fix
Fix for some electronics buttons having the wrong label on their pulses.
2019-06-21 17:25:44 -05:00
mistyLuminescence
0d51ea81d5 tinytweaks (#6206)
* tinytweaks

* 5 != 2

* smfix

* requested changes + fixes exploit from 6212

* it compiled and worked anyway but go off i guess travis

* requested changes
2019-06-21 16:06:44 -05:00
Anewbe
6a86783e32 Merge pull request #6221 from mistyLuminescence/bettersplinting
Head/chest/groin splints
2019-06-21 16:05:31 -05:00
SubberTheFabulous
40b231af2d makes some alt. roboheads use their monitor_styles 2019-06-21 23:22:36 +07:00
mistyLuminescence
b2e47ee215 Serenity (#6208)
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
2019-06-20 23:12:37 -05:00
MagmaRam
22526e3647 Changes a few of the input objects in the integrated circuit/custom electronics system to be sending pulses when activated rather than not being able to do anything except activate (which would do nothing) when pulsed. 2019-06-20 18:17:30 -05:00
Anewbe
a23f9e4822 Merge pull request #6219 from Mechoid/Event_Retweakening
Tweaks the NewTM event system further
2019-06-19 22:33:26 -05:00
Woodratt
44f738d849 June Map Tweaks v2
- Brightness Range on lights increased from 6 to 7 to stop certain quirks with the darkness
- Fix bugs on main outpost map
- Fix Mercenary ship turrets
- Fix Chapel Mass Driver
2019-06-19 18:07:20 -07:00
if there were two guys on the moon
e144bb77f6 Head/chest/groin splints 2019-06-19 13:09:57 +01:00
GeneriedJenelle
5c7c959949 Adds Cider Bottles (#6201)
* Adds Cider

How has SS13 alcohol gone on so long without cider? Let's fix that.

* Update cartridge_presets.dm

* Update dispenser2_energy.dm

* Update dispenser_presets.dm

* Adds cider bottle sprite + adds to borgs

* Update Chemistry-Reagents-Food-Drinks.dm

* Removes additional cider entry
2019-06-18 19:04:35 -05:00
Novacat
584a9a410c An assortment of Lighting Stuff (#6196)
* An assortment of Lighting Stuff

- Makes Lighting less uniform (Bay PR #19808)
- Has lights fetch lighting data from bulbs (Baystation PR #13614)

Ported from Baystation code.

There is currently an issue where there are unnatural dark spots. Simply removing and re-inserting the nearest lightbulb seems to remove these dark spots, which suggests it is an initialization issue.

* Ports the rest of 13614

* Changeling and Travis

* Feedback Fixes
2019-06-18 18:56:30 -05:00
Woodratt
ee162e9e3d June Map Adjustments (#6209)
- Turrets and respective controls added to each teleporter room
- Air tank on shuttles switched out with an air canister
- Fix for Dock 2 Transfer Shuttle airlock buttons not working
- Intercoms added to arrivals shuttle
- Fix Bridge Secretary Quarters tint
- Roundstart Tcomms SMES starts fully charged.
- Landmarks for Bluespacerift added
- Large Air tanks on station have the same amount in them as air canisters
- Expanded atmospheric tanks to be 2 by 3 instead of 2 by 2
- Wilderness Shelter Area added
- Wilderness Shuttle landing point shelter updated
- Wilderness Shuttle landing sides should no longer shiskabob shuttles
-Teleporter room hand tele can now spawn in one of 4 places
- Halved the warm up time when the autopilot on the shuttles start at round start from ten minutes to five and nine respectively. Should mean the first shuttle will be taking from the outpost when the second shuttle leaves the station
- Amount of phoron in the outposts reduced
- Current transit time 75 seconds with pilot, 150 seconds without. Reduced to 60 and 120 respectively.
- Reduction of the amount of steel and glass in engineering by half
- Reduction of the amount of steel and glass in EVA by half
- Ground Xenobio and Xenoflora torn down partially
- Elevator can be accessed at centcomm
2019-06-18 10:33:27 -07:00
Mechoid
8bce9db1e8 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215)
* MakeMeleeGreatAgain

* Where is melee defined?!
2019-06-18 04:50:47 -05:00