Commit Graph

9300 Commits

Author SHA1 Message Date
Aranclanos ad3d3c92ac Removes the deliverychute entirely from the machinery ticker and updates his flush() proc with his parent that I fixed long time ago. Because someone though that copypasting was the best idea to make new machines.
Anyways I'm not planning to keep touching this for a while, if you want to remove the copypasta, please, do it.
If there's a wall on top of the exit of a disposal pipe, the disposal pipe will now shoot the stuff to the wall anyways because being stuck in the holder inside of pipe sucks.
2014-01-10 04:59:24 -03:00
Giacom cac61b9d0c Merge pull request #2273 from Razharas/WhyAIsDontHaveMentalInterfaceFailuresIDontKnow
Fixes AI being carded issue
2014-01-08 11:00:53 -08:00
Giacom 3b6f111bf3 Merge pull request #2274 from Aranclanos/ChangeTurfAwYiss
Linda cries if you don't use ChangeTurf()
2014-01-08 11:00:21 -08:00
Cheridan 46aefa1671 Merge pull request #2272 from ChuckTheSheep/OOC-color-selection
OOC Color Default In Input
2014-01-07 23:39:25 -08:00
Cheridan 20854ea9df Merge pull request #2281 from fleure/log
Fixes changelog whitespace
2014-01-07 16:06:45 -08:00
Fleure 5116ca920c At least I got someone's number tonight 2014-01-08 00:04:00 +00:00
Giacom 1d9c04e620 Merge pull request #2269 from Glloyd/master
Fixes map errors on the away maps.
2014-01-07 13:49:25 -08:00
Cheridan bf5327b6f6 Merge pull request #2276 from fleure/log
Updated changelog
does anybody even read these?? ?
i was a swedish admiral in a past life
2014-01-07 11:00:07 -08:00
Fleure 6a5d89ffe5 Updated changelog 2014-01-07 18:57:15 +00:00
Cheridan e8e58ebbac Merge pull request #2261 from Razharas/ICantCodeForShit
Fixes R&D working improperly
2014-01-07 10:49:04 -08:00
Razharas e468ea24d1 I dont have one so no idea hows it spelled
Fuck you grammer
2014-01-07 22:01:08 +04:00
Razharas a4780069d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into WhyAIsDontHaveMentalInterfaceFailuresIDontKnow 2014-01-07 21:58:16 +04:00
Razharas 7db7be3034 Merge branch 'master' of https://github.com/tgstation/-tg-station into ICantCodeForShit 2014-01-07 21:42:05 +04:00
Cheridan b2108a98ac Merge pull request #2246 from Giacom/followme
Made the ghost follow verb less buggy.
2014-01-07 08:54:00 -08:00
Cheridan 0665ff4125 Merge pull request #2264 from Giacom/disposal_outlet_runtimefix
Fixes the disposal outlet runtiming.
2014-01-07 08:42:21 -08:00
Cheridan afd6b5fa22 Merge pull request #2266 from fleure/janradio
Gives janitor service headset
2014-01-07 08:37:24 -08:00
Cheridan 0102191bbc Merge pull request #2247 from Giacom/blinkyoself
Changed blink to only spawn a single static smoke cloud.
2014-01-07 08:28:06 -08:00
Cheridan 1a58a3cf86 Merge pull request #2265 from fleure/watertank
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
Cheridan 34fad5272b Merge pull request #2262 from Razharas/NoIReallyCant
Fixes cloning not working properly
2014-01-07 07:44:44 -08:00
Giacom 7cb6fcb5dc Merge pull request #2243 from Cheridan/Ninja
Ninja Death Tweak
2014-01-07 06:34:35 -08:00
Giacom 1b24019529 Merge pull request #2253 from Cheridan/Map
[Map] Boxstation updates
2014-01-07 06:28:02 -08:00
Giacom 9602bd2c14 Merge pull request #2256 from Aranclanos/RRpls
Half of the runtimes of four days here
2014-01-07 06:24:57 -08:00
Giacom dbfb8ca052 Merge pull request #2254 from Razharas/Text2PathFix
Fix of mech fabricator
2014-01-07 06:24:12 -08:00
Aranclanos 42e13b8914 Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell. 2014-01-07 09:19:59 -03:00
Razharas ca0423ee9c Fixes AI being carded when not in the core
Yep thats it
Fixes #1862
Fixes #2271
2014-01-07 11:55:34 +04:00
ChuckTheSheep b5ba90cc6f OOC Color Default In Input
Added the "default" field in the input when selecting an OOC color so
that it starts on the current color instead of black.
2014-01-07 01:04:45 -05:00
Cheridan fbeeae0a4c Merge pull request #2230 from Intigracy/Redbuttonisshittysoisdoubleagent
Big red button / syndicate bomb changes
2014-01-06 18:23:07 -08:00
Glloyd 61fdd7e3f0 Fixes map errors on the away maps. Just turf/plating/airless/asteroid to turf/plating/asteroid/airless on blackmarketpackers.dmm, listeningpost.dmm and spacebattle.dmm. Also fixes the outdated shotgun path on stationCollision.dmm. 2014-01-06 19:07:55 -05:00
Cheridan 58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
Poker tables
2014-01-06 14:35:03 -08:00
Cheridan cf0d70c767 Merge pull request #2237 from Jordie0608/ispentareallylongtimeonthis
Fixed justicebot
2014-01-06 14:12:26 -08:00
Cheridan 9bff546dad Merge pull request #2245 from Nienhaus/master
Side Part hair
2014-01-06 13:48:35 -08:00
Cheridan 49da9996ef Merge pull request #2228 from Incoming5643/LOGDEMSPELLS
[Maniac Mansion] Adds attack logging to learning spells from one time use spellbooks
2014-01-06 13:40:04 -08:00
Giacom a219896082 Merge pull request #2241 from ChuckTheSheep/explosiveoptimization
Explosion Optimizations
2014-01-06 13:07:05 -08:00
Aranclanos 122c167f8c Merge pull request #2267 from Metacide/master
Updated MetaStation.v39A.II.dmm to MetaStation.v39A.III.dmm
2014-01-06 13:05:39 -08:00
Metacide 31eefb3e29 Updated MetaStation.v39A.II.dmm to MetaStation.v39A.III.dmm
*Added missing air alarm to the bar.
*Updated mining and stacker machines to use new input/output vars.
*Changed tiles in hydroponics to grey from white.
*Made the toxins test site camera give off light.
*Adjusted tile colours on the main hallways slightly.
*Adjusted securitron waypoints so they no longer travel through the execution chamber.
*Fixed privacy shutter on the firing range appearing above grille.
*Fixed unnecessary reinforced table in botany.
*Other small fixes.
2014-01-06 21:02:37 +00:00
Fleure c50255107a Gives janitor service headset 2014-01-06 18:51:22 +00:00
Fleure 333d0ed045 Reduced watertank slowdown slightly 2014-01-06 18:26:06 +00:00
Giacomand f0a8e2bc76 Fixes the disposal outlet runtiming. The removed code, which was causing the runtime, wasn't even doing anything and was just setting "throwing" to 2 for no reason. 2014-01-06 18:20:59 +00:00
Razharas 2d4c909cf2 Fixes cloning not working properly
How did this even happen i dont know
2014-01-06 21:39:32 +04:00
Razharas 83c9481bfc Fixes R&D working improperly
Yeah thats it
2014-01-06 21:34:10 +04:00
Cheridan 71a6d9882d Eh missed a couple 2014-01-06 10:44:41 -06:00
Aranclanos 233a5b3b9b Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs. 2014-01-06 06:34:17 -03:00
Cheridan ad8857f1fe Adds some lighting to the test area. 2014-01-06 00:23:27 -06:00
Razharas 0725b8ccef Fix of mech fabricator
Fixes #2248
Fucking text paths are poisoning my contributions
Thanks Obama
2014-01-06 09:17:30 +04:00
Cheridan 8e09974130 oh god this will break EVERYTHING i'm sure of it 2014-01-05 22:32:12 -06:00
Cheridan e0dadd9de4 Boxstation update
Phew, this one hits a few things:
Removes the now-unnecessary input/output landmarks for mining equipment.
Replaces the instances of turf/simulated/mineral (which do not create ores) on the asteroid with turf/simulated/mineral/random.
Replaces the bloated toxins test area, with the one trialled on Metastation.
HoP office and Away Mission area equipped with shutters, inspired by Metastation.
2014-01-05 22:12:21 -06:00
Cheridan 26d3d03d69 Merge pull request #1906 from Aranclanos/GiaPlsFix
Removed the need of input and output objects for the mining machinery
2014-01-05 14:23:28 -08:00
Nienhaus 2685c54fc9 Icon update
The side now looks like the bottom one on this picture
http://puu.sh/6arFw.png
2014-01-05 16:16:12 -06:00
Aranclanos dedefdd8ba Merge pull request #2249 from Metacide/master
Updated MetaStation.v38S.dmm to MetaStation.v39A.II.dmm
2014-01-05 14:03:10 -08:00
Metacide deb8caab47 Updated MetaStation.v38S.dmm to MetaStation.v39A.II.dmm
*Overhauled a lot of the crew quarters areas.
*Updated clown shuttle to current BoxStation variant.
*Updated tcommsat z-level teleport to current BoxStation variant.
*Swapped locations of tech storage and auxiliary tool storage.
*Added another lightbulb to the west side of the cryo room.
*Added a reclassification board to robotics.
*Added robocop, quarantine, safeguard, and T.Y.R.A.N.T. boards to the AI Upload.
*Added a bucket and mop to medbay.
*Added a teleport beacon to mining.
*Added Wags-His-Tail to the janitorial closet.
*Added fore, aft, starboard and central teleporter beacons to the station.
*Added a sink to virology.
*Added a PDA cartridge dispenser to the HoP's office
*Added a coin-press to mining.
*Added tower-cap seeds to the garden.
*Added stools at the kitchen hatch.
*Fixed shield generators in engineering secure storage starting bolted to the ground.
*Fixed new toxins filter being dense (you can now walk over it) and moved it slightly.
*Fixed HoS office blast doors not being dense (you can no longer walk over them).
*Fixed incorrectly aligned tiles in research.
*Fixed missing hazard plating east of kitchen/botany.
*Fixed layer var of the PANDEMIC, beakers shouldn't appear below it now.
*Fixed incorrect belt type in a locker in maint, it is now a regular tool-belt.
*Fixed unconnected air vent in the unisex showers.
*Fixed duplicated bulb in janitor's closet.
*Moved the captain's spare ID from their desk to their quarters.
*Moved lighting around in the bar to try and make it darker and seedier.
*Moved the fire alarm under the status display in cargo office.
*Removed gag from theatre storage.
*Removed a table under the MiniSat borg charger that was blocking it.
*Removed access requirements for the mining shuttle computer.
*Adjusted the bridge slightly.
*Adjusted blast door button in nuke-op shuttle so it can be used from outside too.
2014-01-05 21:47:47 +00:00