cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 18:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,444 Commits 2 Branches 1 Tag
33917763dfa7035428d23ec6eb4f759cb1518910
Commit Graph

2460 Commits

Author SHA1 Message Date
mwerezak
715056fca7 Readds tator fab to drone bay 2014-06-03 20:01:16 -04:00
mwerezak
c02beec895 Adds a camera console to the drone bay 
So if a drone is causing trouble you don't have to run back and forth
between consoles.
 2014-06-02 20:24:45 -04:00
Boop
168c39dd54 refactors some disposals filtering code and remaps some disposals pipes 
New things!
/obj/structure/disposalpipe/tagger
 - retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders

Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.

Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.

Not a feature, just a fix for drones being sad about weird disposals. <3
 2014-06-01 23:30:20 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Zuhayr
a29861480a Fixes #5023 2014-05-28 16:35:06 +09:30
PsiOmega
a8e4dc045d Fixes #4816 and nothing else. Cherry picked from #5036. 
Creates proper area instances for sections in engineering.
Removes one out of two APCs in the same area in medbay, adds two missing ones.
 2014-05-22 23:12:50 +02:00
Loganbacca
6be74a4dc3 Minor map fixes 
- Fixed missing wire running to Misc Research and Toxins Storage
- Renamed Telescience doors
- Tweaked arrival shuttle windows
 2014-05-18 19:50:46 +12:00
Loganbacca
bfb5043998 Fixed broken emergency shuttle 2014-05-18 10:28:36 +12:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Mike
2d2a145907 Replaces broken generator in eng hard storage 2014-05-14 00:47:01 -04:00
Zuhayr
08f0dd7491 Fixes mailing issue from anywhere to drone fabrication. 2014-05-12 13:15:55 +09:30
Zuhayr
c63c681caa Double whoops. 2014-05-11 13:45:30 +00:00
Zuhayr
ff56d3e1bb Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers. 2014-05-11 21:38:29 +09:30
Mloc-Argent
7c5c9d3a29 map: fix bad distro piping 2014-05-09 19:38:47 +01:00
Mloc-Argent
32b9ff899d map: fix a missing scrubber pipe 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-09 18:53:04 +01:00
PsiOmega
f64eae04bf Don't tell anyone but I snuck in another distribution pipe fix. 2014-05-09 18:28:11 +02:00
PsiOmega
26e872f054 Of course.. helps if the light button is actually still in the correct area. 2014-05-09 12:05:04 +02:00
PsiOmega
3668165873 Moves the light switch that affects every light -entire- prison wing from the perma-brig to a more reasonable location. Future solution: Look at creating more areas? 
Virology now has emergency shutters on its exterior windows. No one likes a plague-carrier but seems rude to let people to due from lack of oxygen simply because a window breaks.
 2014-05-09 11:56:35 +02:00
PsiOmega
568db284e7 Misc. Research had a weird old tile, causing yet another pipe-disconnect. 2014-05-08 22:23:40 +02:00
PsiOmega
c3ee0b084f More overwritten pipe-changes detected. Central area, r-wall move. 2014-05-08 22:03:29 +02:00
PsiOmega
7a8dbd1fc3 Restores lost vents and scrubbers around central hallway and broken pipes, caused by previous merge. 
Expands central hallway area where necessary to ensure that, for example, air alarms in the captain's office won't lower emergency shutters in the hallway.
Sorts some odd lone emergency shutters in the brig.
 2014-05-08 21:52:11 +02:00
PsiOmega
c5d1266545 Attempt to restore vents, scrubbers and pipes around central. 2014-05-08 16:43:32 +02:00
PsiOmega
2d2462ac75 Atmos distribution pipe was cut off from the station, now re-connected. 
Paired a vent with a scrubber in the engineering lobby.
Moved a scrubber in central hallway. Restored missing power cable and fire shutter in the previous turf.
Re-organizes engineering EVA a bit, so that a scrubber wasn't lying across a scrubber pipe.
Re-colours some pipes in the engine.
 2014-05-07 22:44:00 +02:00
Ccomp5950
95c7215fe5 Manual merge fix of map. Ravens no longer allowed to make bit map changes. 2014-05-06 02:46:13 -05:00
Ccomp5950
c7bfb13ac9 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-05-06 01:11:38 -05:00
Ccomp5950
e43305fcc4 Merge branch 'APCsanity' of https://github.com/Ravensdale/Baystation12 into Ravensdale-APCsanity 
MapPatcher had to be run.
 2014-05-05 21:23:40 -05:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Zuhayr
922fdafb25 Merge pull request #4904 from PsiOmegaDelta/Research 
Research outpost - Misc. Research tile correction
 2014-05-05 23:38:26 +09:30
PsiOmega
f5633a9c47 Research outpost had a single Misc. Research area tile which had cut off a scrubber pipe. 
Replaced with appropriate tile, pipe repaired.
 2014-05-04 13:46:44 +02:00
PsiOmega
5dfb9b476b After the master/dev merge there was a mix of area-tiles in a couple of areas. 
Correction affects: Tactical Equipment, Engineering EVA and maintenance, Virology, fire fighting closet by engineering.
 2014-05-04 12:42:12 +02:00
Ravensdale
82e8c34211 Mapping sanity project-APC's 2014-05-03 17:38:18 -07:00
Zuhayr
aeffc6c7f5 Merge pull request #4886 from PsiOmegaDelta/Pacman 
Engineering Generator Replacement
 2014-05-04 01:39:45 +09:30
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Mloc
34ae5d307c Merge pull request #4872 from mwerezak/map-barriers 
Moved inflatable barriers into eng EVA storage
 2014-05-03 11:03:40 +01:00
Mike
5b6880cf95 Fixed step_x, step_y 
Also replaced racks with reinforced tables, looks nicer.
 2014-05-02 21:16:36 -04:00
Mike
d5d7b6c06d Moved inflatable barriers into eng EVA storage 2014-05-02 20:56:48 -04:00
PsiOmega
09ac23736e Replaces base-type generator with a standard Pacman (which inherits from this type). 
The base type has two problems:
One: It has infinite power
Two: It cannot be anchored, so the infinite power cannot be utilized
 2014-05-02 23:11:49 +02:00
Mike
69ee17daf8 Fixed medbay maintenance wierdness 2014-05-01 19:45:29 -04:00
Mike
dbb40cc874 Fixed shutter direction 2014-04-30 19:49:49 -04:00
Mike
ee83a00728 Changed privacy shutters to actual shutters 2014-04-30 19:19:20 -04:00
RavingManiac
96b7647039 Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts. 2014-04-28 00:28:06 +08:00
Cael Aislinn
c80852365f replaced two bubble shield gens in engineering storage with hull shield gens leaving one bubble shield gen 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2014-04-26 17:29:01 +10:00
Brian Cook
16d3a5738c Added light to bar - Try 2 
Area by kitchen counter was too dark.
 2014-04-25 20:46:02 -07:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
DJSnapshot
bbf7b31ccd Fixes to carbon copy paper. Basically merging it with regular paper bins. 2014-04-25 12:59:50 -07:00
PsiOmega
063ec6de06 Makes some maintenance tunnels less clean and pristine. Nothing excessive, aim was to restore a little bit of character. 
Misc. additions:
Moves a scrubber in the tactical storage which was overlapping an APC terminal.
Restores what appeared to be an air supply pipe overwritten by a scrubber pipe (which didn't even have the same orientation causing a disconnect).
A little bit less pipes in r-walls by the HoP's office.
 2014-04-25 09:42:23 +02:00
Asanadas
70c2968b7a A fix for psychiatrists spawning on the start splash. Their spawn point was named "psychologist". Heh. 2014-04-22 17:53:05 -04:00
RavingManiac
4fd01c2384 Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1. 
Fitness room rearranged to make more sense, with glass around pool.
 2014-04-20 22:35:59 +08:00
Mike
2d7dca8eb5 Added beanbag shotguns to the tactical armoury 2014-04-18 20:28:53 -04:00
Mike
9ddd4afd39 Fixes #4774 with maptools 
Maintenance door had access code set to "0" and "9". Changed it to "0"
and "9;12;47". Also updated the maintenance doors near virology from "0"
and "0" to "0" and "12;39" to match similar doors.
 2014-04-18 19:48:03 -04:00