Commit Graph

24334 Commits

Author SHA1 Message Date
RadiantFlash7
e26b48d335 Map fixes.
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
2020-01-05 01:09:08 -05:00
Cebutris
b22008f01f i probably should have tried to compile this before making the PR but i'm not that smart 2019-12-31 05:06:37 -05:00
Cebutris
15a67e8141 We're not on Virgo anymore 2019-12-31 04:51:44 -05:00
Repede
9e43e721c6 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-29 21:19:41 -05:00
Hawk_v3
70711c03e1 Merge remote-tracking branch 'upstream/master' 2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch
Adds a new fish, measelsharks!
2019-12-29 15:11:46 -05:00
Hawk_v3
48b0362f8e Duplicate Definition 2019-12-29 19:33:40 +00:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Novacat
0ba0682c08 Merge pull request #6382 from VOREStation/upstream-merge-6587
[MIRROR] Allows to set department names on fax machines
2019-12-29 09:07:00 -05:00
Heroman3003
f1c23c4f5a Allows to set department names on fax machines (#6587) 2019-12-29 02:44:04 -05:00
Verkister
f5e02b9b23 Fixes chairs acting as handcuffs. (#6588)
* Fixes chairs/beds/etc acting as handcuffs.

It's been at least 7 years without anyone noticing a broken feature with a false comment so the unintentional "balancing" caused by this may have ingrained a standard some folks would rather keep in, but that kind of nerfs have proper ways of implementing at their own appropriate places in the code.

Basically this just lets folks use hands when buckled. May also have a side effect of allowing self-surgery if it never had a proper prevention method implemented. Keeps an exception for xeno nests tho. Any other seat has no reason to be handcuffs.

* Fixes another thing causing chairs to incapacitate

"Are you seated" and "Are you incapacitated" should not be used as the same thing yet here we are.

I should probably also do a refactor to remove all the inappropriate use of canmove var. Seriously, even the specifically cartridge exclusive PDA menu buttons are using that for what???
2019-12-29 02:42:50 -05:00
Repede
7eaa9e62e5 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-28 17:27:28 -05:00
Repede
3b360bb871 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-28 16:20:19 -05:00
Repede
2ef29bce49 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-28 16:20:17 -05:00
Repede
b49e8bf7a6 Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-28 12:43:29 -05:00
Repede
5c33de39c1 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore
# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	icons/mob/robots.dmi
2019-12-28 12:00:22 -05:00
Ashvor
0281a7ed4f Merge branch 'master' of https://github.com/Ashvor/YWPolarisVore 2019-12-28 01:50:07 -07:00
Ashvor
369afed033 Quick edit 2019-12-28 01:46:52 -07:00
Repede
24a555a5fe Merge branch 'master' into master 2019-12-27 21:46:17 -05:00
Repede
9a6e385dea Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-27 21:46:15 -05:00
Repede
8d5a064ed9 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-27 21:46:12 -05:00
Repede
4cd393800c Merge branch 'master' into YWPolarisVore_BorgAdditions 2019-12-27 21:36:53 -05:00
Ashvor
5851151319 New Borg Chassis 2019-12-27 17:37:36 -07:00
Repede
c89f65969b Fixes seromi grab loneliness, and access name changes 2019-12-27 19:05:32 -05:00
Repede
6ba5f77b35 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-27 18:25:32 -05:00
Repede
38d5113a9b Finished, fixing maps and shuttles, fluff access. 2019-12-27 15:51:53 -05:00
Holdelta
d674534825 Update robot.dm 2019-12-27 10:57:18 -08:00
Hawk-v3
6d30885523 Merge branch 'master' into YWPolarisVore_BPetting 2019-12-27 16:00:20 +00:00
Holdelta
39651a8d4f Update station_vr.dm 2019-12-27 03:49:14 -08:00
Holdelta
891c665c18 Update station_vr.dm 2019-12-27 03:39:25 -08:00
Holdelta
ec99fec1a6 Adding borg petting
Adding borg petting, because its fun.
Help intent - Pets borg
Disarm intent - Taps borg
Grab intent - will do original functions(such as removing the battery when the panel is open)
Harm intent - Punches borg
2019-12-27 01:14:10 -08:00
Repede
2af9f4ee44 Merge branch 'master' into master 2019-12-26 20:40:10 -05:00
Novacat
7599ad7041 Merge pull request #6369 from VOREStation/upstream-merge-6584
[MIRROR] Printable Spray Bottles
2019-12-25 20:13:56 -05:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Atermonera
d6b16dd09e Merge pull request #6585 from Verkister/patch-31
Fixes gentle hairstyle missing
2019-12-25 18:10:05 -05:00
Novacat
860566a1b6 Merge pull request #6350 from Verkister/tallboys
Fixes resizing for icons taller than 32p
2019-12-24 12:01:30 -05:00
Novacat
01b57eb28f Merge pull request #6344 from VOREStation/upstream-merge-6572
[MIRROR] Buffs radiation so it isn't defeated by a thin sheet of lead.
2019-12-24 11:59:27 -05:00
Ketrai
15c1c45b34 Makes it so you can use sharkmeat for fish-dishes 2019-12-23 17:57:13 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Shadow
d4e45ee3b1 Adds the Booze Borg 2019-12-22 20:02:36 -06:00
Hawk_v3
5418d55495 Merge remote-tracking branch 'server/master' 2019-12-22 21:33:41 +00:00
Repede
ecb31d04e0 Merge branch 'master' into master 2019-12-22 11:51:38 -05:00
Ketrai
0e65a0b8a6 Adds sharks 2019-12-22 17:32:49 +01:00
Spades
e70816822b Merge pull request #6298 from Sebbe9123/dogborgpounce
Buffs dogborg pounce
2019-12-22 10:41:57 -05:00
Novacat
11405d5c00 Merge pull request #6358 from VOREStation/upstream-merge-6582
[MIRROR] QM can now get optical meson scanners
2019-12-22 10:35:34 -05:00
Novacat
324db0bc2b Merge pull request #6357 from VOREStation/upstream-merge-6580
[MIRROR] APCs/Air Alarms can be (un)locked via altclick
2019-12-22 10:35:25 -05:00
Verkister
928bb57e7a almost forgot pais 2019-12-22 11:05:00 +02:00
Holdelta
a77f3e32e0 Merge branch 'master' of https://github.com/Holdelta/YWPolarisVore 2019-12-21 23:38:14 -08:00
Holdelta
1f0fbcf784 Adding Citadel RP dogborgs(Alternative Pupdozer model/Servicehound) #383
Pure port of dogborgs, may add additional features later.

Additions:
-Vale Pupdozer model
-Servicehounds, four different options
2019-12-21 23:29:09 -08:00
Repede
557bdfcb77 Merge branch 'master' into master 2019-12-22 02:02:55 -05:00