Commit Graph

18680 Commits

Author SHA1 Message Date
Heroman
4736a54b2c Fixes alien wood issues 2019-07-03 15:00:53 +10:00
Mechoid
71541c9806 Mo drinks n stuff 2019-07-02 16:59:18 -07:00
Ketrai
7c42591f8e new rock sprites. 2019-07-02 16:49:05 +02: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
ede313118f Properly splits security and engineering alarms 2019-07-02 13:20:56 +10:00
Mechoid
f62b44ff84 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into CivilianExpansion1 2019-07-01 19:06:08 -07: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
ac5db23786 Fixes '1' message 2019-07-02 07:36:58 +10:00
Ketrai
b75b7e013e adds ledges, adds more contrasts. 2019-07-01 16:52:33 +02:00
Heroman
44755ae3de Fixes farmbot infinite looping 2019-07-01 17:42:53 +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
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
Ketrai
c7a542eb51 Implements the new walls and flooring. 2019-06-29 03:18:09 +02: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
Ketrai
89070e1449 Adds a random outcrop 2019-06-28 22:19:12 +02:00
Ketrai
82c8ad1d67 The great rock update. 2019-06-28 21:47:47 +02:00
Heroman
896897a398 QoL improvements for broken components 2019-06-28 19:33:35 +10:00
Cerebulon
57106d3c12 Adds news articles since January to the newscaster. 2019-06-27 07:19:10 +01:00
Mechoid
c2d4966cba Merge branch 'master' of https://github.com/PolarisSS13/Polaris into CivilianExpansion1 2019-06-26 16:17:58 -07:00
Mechoid
36fd0198e7 Starts work on CIVILIAN EXPANSION 2019-06-26 16:04:37 -07: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
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
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
Novacat
5b18382ca6 Grey scale pills and colored pillbottles (#6199)
* Grey scale pills and colored pillbottles

Baystation ports of PR #19714 and PR #21578

Known issue: The Chem master's pill selection does not properly show the grey scale pills, unfortunately. There is a 'close enough' approximation, however.

* Minor oversights

* Another oversight

* Programming language confusion

* Corrects some code
2019-06-16 20:28:02 -05:00
Mechoid
c7407942ee Tweaks the NewTM event system further, adds a weather shift event for when people are groundside and outdoors. 2019-06-16 18:27:53 -07:00
Anewbe
a917728e09 Language scrambler checks for more punctuation 2019-06-16 20:18:22 -05:00