Commit Graph

22442 Commits

Author SHA1 Message Date
Intigracy
f4f7164826 Wow I merged Intigracy's first how unwise (#9213)
attack_verb is now always present tense
removes an unused and unticked hydro.dm which has the old defines for plants n shit
2016-04-07 11:47:02 -05:00
Probe1
cf44137ead Fix unpowered cooking machines working (#9290)
if(stat & (NOPOWER | BROKEN))
		to_chat(user, "<span class='warning'> The powers off, it's no good. </span>")
		return

added to prevent cooking machines being usable while unpowered
Fixes #8825
(Probe fucked up the first PR)
2016-04-07 11:33:55 -05:00
Intigracy
d0c3a493ca Fixes getting obj/item/stack/tile from mining (#9292)
Fix #9141
2016-04-07 11:31:23 -05:00
Intigracy
bd436d9124 Intigracy's a-okay fix for the adminwho refactor (#9295) 2016-04-07 11:28:51 -05:00
Probe1
0cd1505054 #9248 Some stupid shit with mapping and defficiency
* Removes a fucking scrubber attached to the supermatter engines cooling loop why

Adjusts the nuke ops shuttle landmark by shifting it 10 tiles to the right so they don't fly into atmospherics.

* Gets rid of duplicate monkeys and opens up the anomaly lab at the research outpost so machines weren't under a firelocker causing them to malfunction.

* WE WANT THE FUNK.
GIVE US THE FUNK.

Research Outpost Overhaul pt1

* research outpost pt2

* research outpost pt3.  major changes complete.  piping, wiring, apcs and alarms added.  all that remains are firelocks, cameras and finishing touches.

* Added a washing machine to the bathroom instead of a toilet.  Xenoarcheologist felt it was more important, he probably is the kind of shifty dude that would pee in the sink.

Removed monkeys from long term storage.  I don't know why having monkeys where you put large artifacts was a problem but they felt it was important.

* Done with research outpost

* PJB keeping me honest; deletes two extra excavation suits I didn't realize I doubled up.

* Adds air alarms and areas.  Bitches love accurately placed areas.

* First pass on deffiency engineering.

1.  Redid all the atmospheric piping inside the supermatter room and monitoring area to avoid running pipes under rwalls.  This was not pleasant but it's done.

2.  Made choice usage of manifolds for the SME cooling loop to make it very, very easy to hook up to an outside space cooling loop while still maintaining the freezer setup for new players.

* Removes the layered piping I added, adds a window, adds an RPD to the CEs office.  Makes a small adjustment to the SME piping.

* Changes the area of the supermatter control room to be area/enginecontrol instead of engineering.  There are way too many things on a single APC here

* Moves the AME to the south side of engineering and opens up a can of worms calling all the shitty wiring and piping into question.

* Finishing touches on the AME move to the south of engineering

* Base R-UST room without any trimmings.

* Initial placement of the R-UST area.

* R-UST 50% added

* Adds a rust_control area.

More rust work.

* Adds rust_control area.

* extra space

* Finishes major changes to Deff Engineering, polish and refinement need completed.

* Adds some pod stuff to allocate for a pod facing a new direction, and modifies the centcomm pod shuttle.

* Hey motherfucker I did clean the map.  Just not at the right time.

* Adds a crew monitoring console to medbay lobby (this is the only one that exists outside the paramedics room).

Swaps the grinder and shotgun table in the bar backroom.

Deletes a lightswitch in the research outpost breakroom that was obscured and lets face it, every single room doesn't need a light switch.  Even if the lights are switched off, the light from the hallway keeps it illuminated anyway.

Tests all my shit.

Finishes my shit.
2016-04-07 11:26:55 -05:00
sood
2402f366c3 Admin sanity things
* response team join log

* buff who verb for admins
2016-04-06 19:45:10 -05:00
PJB3005
ba1bd93560 Fixes a boutput runtime
* Fixes a boutput runtime

* whoops
2016-04-06 14:54:45 -07:00
Intigracy
b9705b97f4 removes vgstation.dmm since it's just an old old version of box and is unused anymore. it'll remain in github's memory 5ever
removed an admin message that has 0 use anymore due to the time that has passed since it was added



removed an immersion breaking message
2016-04-06 12:22:43 -07:00
Intigracy
26108987c9 - tweak: "You no longer overdose on Inaprovaline. This will make you come out of the cloner with less damage, too." 2016-04-06 11:06:30 -07:00
Jeroen
4d98f12fc8 Adds a snack called "Old Empire Bar" as a reference to Age of Empires.
* Adds a snack called "Old Empire Bar" in reference to Age of Empires.

A few days ago the IC chat wasn't sanitized and I accidentally played `rogan.mp3`, I thougt that it was a 1 second audio file but it was a 9 minute audio file of "Rogan?" repeating over and over.
Worked on this for the last hour but I am finally at a stage where I am confident at making a pull request.

Signed-off-by: Jeroen de Neef <jeroen52@gmail.com>

* This should fix the merge issues, these are sadly binaries because else I could've done it better.

* Added more notices. These are my favorite taunts.

* Added the changelog for the Old Empire Bar bar and Rogan reagent.

Signed-off-by: Jeroen de Neef <jeroen52@gmail.com>
2016-04-06 11:03:50 -07:00
Probe1
f46bf7886f Box fixes
* BOX CHANGES

Tweaks a fire alarm in cargo to be accessible
Adds scrubbers and vents in recycling to get full room coverage
Adds sound system to Port Hallway

Changes Supermatter Chamber on Box to be pure nitrogen @ 103 kPa instead of vacuum floors.

Fixes dorm button in the research outpost.

Fixes mining outside conveyor using bauds recommended fix.

Adds a camera to the starboard hallway outside the library for complete coverage.
Renames camera outside robotics to match other cameras in the area.
Revamps solution to the mining conveyor by redesigning the exterior so boxes aren't placed under a plastic flap
Reverts changes to supermatter chamber so it can be addressed at a later point
Fixes added scrubber to remove CO2 in addition to plasma (whoops)

Removes temperature definition of /turf/simulated/floor/engine/nitrogen in floor_types.dm so that it will use the parent temperature instead of 2.73 K, resulting in the same no appreciable pressure everything goes flying behavior we're seeking to move away from

Adds /turf/simulated/floor/engine/nitrogen tiles to the supermatter chamber on Box

senpai better be fucking pleased

Final adjustments on nitrogen flooring in Box supermatter room.  Names them reinforced floors to disguise their mapping information and improve immulsions.

Replaces the courtroom window door with IAA/Lawyer access in addition to brig access so lawyers can enter the court on their own.

* Adds two additional cameras labeled Fore Port Solar Access and Fore Starboard Solar Access.  They are located in maintenance adjacent to the solar access doors.  This mirrors the already existing camera coverage in the Aft of the station.

Replaces the maintenance windows in the RDs office with Rwalls.  No one knows who changed this.

* Moves the genetics request console to genetics proper where geneticists will see it.

Shifts the air alarm in cloning to take an empty wall space that isn't behind a machine.

Adds an ON speaker tuned to medical frequency next to the cloner so near-crit clonees can call out for help.

* Replaces the toilet at the Research Outpost with a washing machine.

* Fixes a fire extinguisher in medbay that was inaccessible behind a table.  I placed it on the same tile as the table and varedited x_pixel to -32.  Interestingly none of the medbay fire extinguishers had this offset pixel treatment.  Most wall objects do, it's very odd that fire extinguishers did not.

* herp derp fixes the machine/ore/input at the mining outpost so it actually works, hooray for TESTING.

* Fixes the access in the courtroom door.  I had placed it in the wrong variable.  Everything is now tested and works like it says in the PR.
2016-04-06 11:01:51 -07:00
D3athrow
d7d60e9f5e surely profiling db queries won't make it lag more would it? (reverted from commit f710e467a9) 2016-04-05 11:46:17 -05:00
PJB3005
0e171db1a4 More to_chat fixes.
* More to_chat fixes.

* Whoops
2016-04-05 11:35:11 -05:00
D3athrow
f710e467a9 surely profiling db queries won't make it lag more would it? 2016-04-04 20:12:45 -05:00
Intigracy
9886be1e30 fixes the compile warning 2016-04-04 13:20:32 -05:00
Intigracy
16c91f56c6 fixes bandaids not having the bandaid icon 2016-04-03 22:48:55 -05:00
Intigracy
7eff6ebd50 survival boxes are now labeled as survival boxes, spawn with 1 bandaid, which is a single use bruisepack
changes path of box/engineer to box/survival/engineer, adjusted everywhere it's used accordingly

checked our 4 main maps (box, meta, deff, taxi), none of them use this path



removed partial pathing all over boxes.dm
2016-04-03 16:56:02 -05:00
Intigracy
a7d74f8c38 adds nuke poster
renames contraband.dmi since the only thing in it is posters

moves my previously made poster into the correct file

standardizes the beach posters to be like the rest of the poster defines
2016-04-03 16:07:18 -05:00
dylanstrategie
038fc71955 Hotfix to Cancer and amputed limbs
* Hotfix to Cancer and amputed limbs

* Fix returns
2016-04-03 16:05:47 -05:00
dylanstrategie
838a86cd31 Minor balance changes to Cancer 2016-04-02 17:14:29 -05:00
dylanstrategie
bfd48c1a99 Adds admin-only "Inflict Cancer" button
* Get cancer and die

* Give Cancer added to VV

* Change process method again

* Restore that line

* When are we going to fix .gitignore ?
2016-04-02 13:39:28 -05:00
sood
2f4132ad73 Minor performance improvement for supermatter cascade 2016-04-02 02:01:28 -05:00
PJB3005
a8c2b1691e Fixes a *potential* exploit 2016-04-02 02:01:05 -05:00
sood
c9096aa4cb MOB SWARM 2016-04-02 01:52:02 -05:00
Shadowmech88
a5d610a93c Adds Roulette Revolver and No-fruit
Hi friendo
2016-04-02 00:46:32 -05:00
clusterfack
f4b3fa4bca Merge pull request #9199 from Intigracy/roburgers
fixes roburgers turning you into mommis
2016-04-01 21:51:34 -05:00
sood
6e70d30f2a Merge pull request #9174 from coldcola/bananasword
Adds Banana esword as Clown-only Traitor item
2016-04-01 18:04:49 -07:00
Intigracy
dcc0266159 fixes roburgers turning you into mommis
moved a chunk of code so the file is consistent
2016-04-01 17:34:54 -07:00
sood
a2fc30addc Eclairs
Adds eclairs
2016-04-01 17:28:06 -07:00
clusterfack
8253ad9bcb April foolsyo 2016-04-01 17:00:11 -05:00
clusterfack
65c0914401 Merge pull request #9188 from clusterfack/ghostthing
Increase ghost speed
2016-04-01 16:54:33 -05:00
ShiggyPiggy
7469c3f499 Adds Eclairs
https://i.imgur.com/yieIWuC.png
Recipe: 5 Flour, 5 Cream, a chocolate bar.
POSSIBLY MORE ECLAIR FUNCTIONALITY LIKE CUSTOM CREAM TYPES IF I BECOME A
NON-MEME CODER.
2016-04-02 02:34:14 +06:00
clusterfack
34f3c79aa4 Coem at me thread bro 2016-04-01 12:42:44 -05:00
clusterfack
2d91952f49 Fix analyzers
Fix #9186
Fix #9115
2016-04-01 12:42:26 -05:00
coldcola
ade11f93b0 Fixes a couple of typo/grammatical errors, slamsed will no longer occur and vampires jaunt typo fixed.
Update horror.dm

NO MORE SLAMS OF ANY SORT

Update human_attackhand.dm

Update coldcola.yml

add clown-only traitor item - energized bananium sword - very dangerous in bunches

changelog

Update coldcola.yml

fix

Update uplink_item.dm

Update energy.dm

Update uplink_item.dm
2016-04-01 02:29:27 -04:00
clusterfack
b85e36663d Increase ghost speed
This probably works
2016-03-31 22:44:52 -05:00
clusterfack
f1a609ae8a Merge pull request #9042 from unid15/os
New humanoid hostile mobs
2016-03-31 16:38:28 -05:00
clusterfack
cee5be76c5 Merge pull request #8637 from Jeroen52/changing-references-of-subversion-in-the-pai-software-downloader-to-cvs-because-nt-uses-outdated-technology
changing-references-of-subversion-in-the-pai-software-downloader-to-cvs-because-nt-uses-outdated-technology
2016-03-31 16:23:02 -05:00
clusterfack
62bbee4a19 Merge pull request #9025 from coldcola/BolasFix
Makes Bolas Launcher work on more mechs not just Gygax.
2016-03-31 16:15:18 -05:00
clusterfack
5b2479b02f Merge pull request #9131 from Intigracy/statueadjacent
You now have to be standing next to someone to statue them via spell
2016-03-31 16:12:02 -05:00
clusterfack
41f7171e29 Merge pull request #9164 from gbasood/runtime-fixes
Fixes runtimes for thrown objects and targeted spells
2016-03-31 16:10:57 -05:00
clusterfack
b736b37a7a Merge pull request #9167 from unid15/dask
Fixes
2016-03-31 16:08:35 -05:00
clusterfack
6e4fbc45d3 Ok remove return 2016-03-31 11:21:56 -05:00
unid15
cdd6615780 null obj_overlays 2016-03-30 20:56:28 +02:00
unid15
a74b943868 stuff 2016-03-30 20:29:23 +02:00
Sood
bfd14f4c64 Fixes runtimes for thrown objects and targeted spells 2016-03-30 11:01:45 -07:00
sood
df854c1449 Merge pull request #9034 from icantthinkofanameritenow/Bleeding-Edge
Fixes multiple issues with the syndicate base vault.
2016-03-30 08:52:40 -07:00
clusterfack
8f7068ac7b Merge pull request #9151 from PJB3005/REEE-OLDCODERS
Wow rude oldcoders you ruined a xeno round.
2016-03-30 09:09:23 -05:00
PJB3005
93d2299eb8 Wow rude oldcoders you ruined a xeno round. 2016-03-30 14:16:00 +02:00
sood
4d6e777df0 Merge pull request #9146 from PJB3005/boutput_runtimes
Fix some runtimes.
2016-03-30 01:16:32 -07:00