Commit Graph

29275 Commits

Author SHA1 Message Date
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
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
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
Mechoid
ee24188b93 Fixes the Chargeblade's tech cost. (#6216)
* Fixes the Chargeblade's tech cost.

* Update illegal.dm
2019-06-16 20:16:41 -05:00
Anewbe
babda8e54d Merge pull request #6079 from Mechoid/AugmentPreWork
Augment Work
2019-06-16 19:58:15 -05:00
Anewbe
57157151d1 Merge pull request #6214 from Heroman3003/edge-time
Fixes ghost-edge runtime
2019-06-16 19:57:55 -05:00
Mechoid
4b534ee844 Fixes random item spawners not self-deleting after they spawn post-roundstart. 2019-06-14 12:47:13 -07:00
Heroman
927defda50 Fixes ghost-edge runtime 2019-06-14 10:16:08 +10:00
Neerti
8bddb1699f Merge pull request #6204 from Ketrai/worms
Adds worms
2019-06-11 17:34:41 -04:00
Neerti
215f06e966 Merge pull request #6200 from Heroman3003/xenoarch-fixes
Fixes some xenoarch bugs
2019-06-09 11:46:06 -04: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
2b127767c5 Adds supply crates 2019-06-08 16:59:16 +02:00
Ketrai
939819ef6e Adds the ability to dig worms. 2019-06-08 16:13:50 +02:00
Ketrai
61ae1c774c Removes edits. 2019-06-08 14:42:27 +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
Heroman
9c672b5ea0 Fixes some colons 2019-06-07 06:08:37 +10:00
Atermonera
802f178349 Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy
Infinite Frame Fixy
2019-06-06 09:10:45 -08:00
Heroman
ffcd17d78e Fixes some xenoarch bugs 2019-06-06 10:31:04 +10:00
Atermonera
07cf484ac5 Merge pull request #6192 from Heroman3003/amber-heal-fix
Prevents amber slime feeding from healing slimes
2019-06-04 09:15:20 -08:00
Atermonera
995b581b67 Merge pull request #6190 from Heroman3003/modularizationofspaccess
Allows supplypacks with req_one_access to exist
2019-06-04 09:14:20 -08:00
Atermonera
da628bae7c Merge pull request #6189 from mistyLuminescence/manup
Critical ManUpulator Fix
2019-06-04 09:13:02 -08:00
Atermonera
af33db085b Merge pull request #6188 from Mechoid/PuzzleFix
Fix Puzzledoors not being locked when no lock is found.
2019-06-04 09:12:05 -08:00
Atermonera
611ca2b579 Merge pull request #6185 from chaoko99/medibots
lowers the minimum treatment bound of medibots.
2019-06-04 09:10:52 -08:00
Atermonera
a69bd2e9f9 Merge pull request #6181 from Novacat/nova-accessory
Fancy new sprite for elite laptop
2019-06-04 09:10:01 -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
Heroman
db3b3ef6e4 Prevents amber slime feeding from healing slimes 2019-06-02 17:00:48 +10:00
Heroman
926be2ef53 Allows supplypacks with req_one_access to exist 2019-06-02 07:21:41 +10:00
if there were two guys on the moon
e0fa2ec966 Critical ManUpulator fix 2019-06-01 06:48:15 +01:00
Mechoid
e0a6d779b5 Fix Puzzledoors not being locked when no lock is found. 2019-05-31 20:37:04 -07:00
Neerti
305ffcb7a7 Merge pull request #6183 from Mechoid/FixPrecursotechOversights
Fixes some Precursotech oversights.
2019-05-31 22:17:34 -04:00