Commit Graph

15532 Commits

Author SHA1 Message Date
Ketrai
6cc36acccb makes ledges work, kinda. 2019-07-05 17:03:51 +02:00
Atermonera
438e113621 Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2
Flashes actually work as said on the tin.
2019-07-03 19:10:07 -08:00
Atermonera
1f4b96fab6 Merge pull request #6263 from Nalarac/patch-6
Nerfs Simple Doors
2019-07-03 19:07:38 -08:00
Anewbe
4e711c4399 Merge pull request #6259 from Heroman3003/flowerfix
Fixes ppflowers having no icon sometiems
2019-07-03 12:09:11 -05:00
Mechoid
a01fb92313 Flashes actually work as said on the tin. 2019-07-02 23:42:08 -07:00
Andrew
4f8173e3b7 Fixes bullet_act to Proj.force 2019-07-02 21:28:37 -05:00
Andrew
e6b3c67465 Nerfs Simple Doors
Simple doors would take the integrity of the material (150 for steel AND resin), divide it by 10, and use that hardness as health. Damage taken by the door would have its force divided by 100. This meant that in order to do 15 damage to a steel door with a baton, you'd need to hit the door 100 times. Now you only need to hit the door 10 times.

Also makes it so bullets/lasers work against the doors

Summation: Resin doors take 10 baton hits to break. (Resin walls take 14.)
2019-07-02 21:24:52 -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
Mechoid
f62b44ff84 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into CivilianExpansion1 2019-07-01 19:06:08 -07:00
Heroman
1a64480516 Fixes ppflowers having no icon sometiems 2019-07-02 11:23:52 +10:00
Atermonera
7fe38b397f Merge pull request #6248 from Heroman3003/gpsing
Adds more GPS variety
2019-07-01 16:46:52 -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
Ketrai
b75b7e013e adds ledges, adds more contrasts. 2019-07-01 16:52:33 +02:00
Heroman
9b4d6f939a Fixes deconstructed wall frames blocking passage 2019-07-01 17:33:21 +10:00
mistyLuminescence
2ec54f0151 Adds two new Cargo crates! (#6194)
* Adds 2 new cargo crates
2019-06-29 16:45:46 -07:00
Anewbe
5ffd8dbbee Merge pull request #6238 from Heroman3003/broken-components
QoL improvements for broken components
2019-06-29 03:08:12 -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
Andrew
00557df467 Arcane on Soul Stone 2019-06-28 16:08:56 -05:00
Andrew
fb19721631 Adds Arcane Tech to Cult Items
Cult blade gets combat 1 and arcane 1
All cult armor gets material 3 and arcane 1.
2019-06-28 11:30:50 -05:00
Heroman
896897a398 QoL improvements for broken components 2019-06-28 19:33:35 +10: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
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
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
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
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
4b534ee844 Fixes random item spawners not self-deleting after they spawn post-roundstart. 2019-06-14 12:47:13 -07:00
Ketrai
2759198226 fixes a tiny pathing error 2019-06-08 19:55:31 +02:00
Ketrai
360dc49422 Makes it so digging up worms takes time. 2019-06-08 19:14:36 +02:00
Ketrai
362b33882a Adds a fishing vendor. 2019-06-08 19:07:18 +02:00
Ketrai
939819ef6e Adds the ability to dig worms. 2019-06-08 16:13:50 +02:00
Ketrai
ea5c1393bf Fixes a tiny path error. 2019-06-07 20:08:05 +02:00
Ketrai
d891fa2836 Adds worms 2019-06-07 19:55:03 +02:00
Atermonera
802f178349 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy
Infinite Frame Fixy
2019-06-06 09:10:45 -08:00
TheFurryFeline
00507fee40 Infinite Frame Fixy
On the tin: fixes production of infinite frames by porting https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855. This also eliminates the given runtimes of being unable to read a board type if it wasn't given for the machine object. Additionally allows machines related to Hydroponics to be unwrenched while refusing to create frames when crowbar'd, returning a whack instead. Tested and it works.
2019-06-03 20:07:49 -04:00
Mechoid
e0a6d779b5 Fix Puzzledoors not being locked when no lock is found. 2019-05-31 20:37:04 -07:00
Mechoid
d7e24eac80 Fixes some Precursotech oversights. 2019-05-28 12:33:44 -07:00
Neerti
4777474b4e Merge pull request #6169 from GeneriedJenelle/patch-1
Ports Radial Menus
2019-05-28 14:25:17 -04:00
Atermonera
ef7568a6ae Merge pull request #6154 from Mechoid/Sif_Tree_Expansion
Sif Trees and Icon Scaling
2019-05-28 09:21:22 -08:00
Atermonera
f4cbeb6572 Merge pull request #6172 from mistyLuminescence/contacts
Makeover Kit
2019-05-28 09:09:12 -08:00
GeneriedJenelle
835a5a0409 Fixes ringing when attacking people with deskbells 2019-05-24 13:57:15 +01:00
Mechoid
d57e6d4183 Adds 0 checks. 2019-05-23 12:56:49 -07:00
mistyLuminescence
209cb3624c Big Bugfix Bonanza (#6170)
* Big Bugfix Bonanza

* changelog

* deunifies the Unity

* fixes changelog

* 60 is bigger than 50
2019-05-23 09:58:29 -07:00
if there were two guys on the moon
19d5bece10 makeover 2019-05-22 18:36:12 +01:00