Commit Graph

256 Commits

Author SHA1 Message Date
Aranclanos
02d18de52a Fixes phazon chassis availability in the mech fabricator, they were missing. 2014-11-14 14:45:38 -03:00
hornygranny
d4a5d2ba1f Merge pull request #5786 from Miauw62/runtime1
Fixes some RD console runtimes.
2014-11-10 08:43:10 -08:00
Aranclanos
9b89f9160d Adds mechfabricator_designs.dm, a file with all the default designs for the exosuit fabricator.
Updates the .dme file to add the new file.
2014-11-09 11:41:24 -03:00
Miauw
28605093e2 Fixes some RD console runtimes. Fixed #5783 2014-11-09 13:59:25 +01:00
Aranclanos
d56698f991 Exosuit fabricator revamp
Exosuits will now use the designs from RnD to create objects instead of having the object already created on their contents.
Each one of the default items to build are now designs.
Removed access required to use the exosuit fabricators.
Removed an unused mech syringe gun design and replaced with a new one, with no cost.
Added a temporal object, /obj/item/mechavars, to be able to use initalize() for the construction time. This will be later on removed and the construction time will be ported to the design datums.
Some minors issues are still present, due to the amount of files needed to fix these, it won't be part of this commit, but a future one.
Fixes issue #3893
Removed required access to access the setting controls of the RnD console.
2014-11-06 23:45:16 -03:00
paprka
1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-11-03 17:57:40 -08:00
hornygranny
8b4ab665cb Merge pull request #5490 from tkdrg/hiasl
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
hornygranny
7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
tkdrg
d3727e6e3e Removes unused code instead of commenting it out 2014-11-03 18:25:05 -03:00
tkdrg
a97c4de972 Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
2014-11-02 14:10:03 -03:00
tkdrg
30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl
Conflicts:
	code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
paprka
df289b5c53 Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-31 10:28:57 -07:00
paprka
389e0e1237 research design and origintech update 2014-10-30 19:21:58 -07:00
Swag McYolosteinen
4e7cb0eb01 Merge pull request #5530 from MrStonedOne/fukkinreallyerro
[MSO] Minor sql improvements.
2014-10-30 21:00:42 +01:00
MrStonedOne
afbeb03d9f Fixes admin only vv related sql injection exploit in feedback reporting.
Noticed this while looking over my PR, by storing (and trusting) the escaped version, an admin could edit this in vv and do unspeakable things to the database
2014-10-29 18:19:47 -07:00
MrStonedOne
40d884dbfa Feedback reporting now uses 1 insert query with mutiple rows
Rather then making a new query for each feedback item.
Each query can take between 25ms and 100ms, and this is a static per-query overhead, so removing the 60 or so needless querys will speed things up.
2014-10-29 04:22:35 -07:00
MrStonedOne
8a064ee545 Removes extra sql sanitize procs in favor of sanitizeSQL() 2014-10-29 04:12:07 -07:00
tkdrg
3a862deb6b Adds chatroom logging (both admin and IC). 2014-10-29 01:20:53 -03:00
paprka
b136cf653c wet floor signs and advanced janitor research 2014-10-23 13:43:42 -07:00
Cheridan
a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1
closets can no longer contain a near infinite amount of mobs.
2014-10-21 12:15:30 -05:00
hornygranny
e556867a58 Merge pull request #5277 from paprka/newshotguns
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
phil235
c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02:00
Cheridan
c67052b58d Merge pull request #5200 from PatchouliKnowledge/Phazons
Lots of mecha changes and additions.
2014-10-20 01:27:50 -05:00
paprka
2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
xxalpha
d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
paprka
f54cafad83 converted most gun crafting to its own module 2014-10-17 09:15:54 -07:00
PatchouliKnowledge
481135177c Lots of mecha changes and additions.
- Added constructible Phazon parts and circuits to R&D machines
- Added a Phazon construction path
- Nerfed the Phazon greatly
 > equip slots down to 3 from 4
 > step_in up to 2 from 1
 > toxin punch damage greatly nerfed (from ~80 tox damage to ~20 per hit)
 > research levels required increased (materials 7, bluespace 6, power 6, emp 6, data 5)
 > research levels from parts reduced
- Fluffed out the Phazon in general (sounds, descriptions)

- Grammar fixes to mecha construction process - added a bunch of missing periods and articles
- Changed Durand construction to require a super capacitor and phasic scanner instead of advanced ones

- Buffed the exosuit extinguisher (now has 1000 water instead of 200)
- Buffed the exosuit plasma generator (now consumes fuel at half the speed and doesn't burn through masses of plasma in minutes)
- Moved the cable layer tool from medical_tools.dm to tools.dm (why even)

- Buffed Ripley's default armour (brute from 20% to 40%, bomb protection 80% instead of none)
- All Ripley variants now have the same lights_power 7 (from Default Ripley's 6, and Death Ripley's 60 which basically created a fully lit square around it)
- The default Ripley can now be augmented with goliath armour plates, up to 70% brute protection (plates drop if Ripley is killed)
- Goliath-plated Ripleys get a different sprite and examine-description
2014-10-11 20:51:54 +03:00
Remie Richards
8503bd632b Merge pull request #5103 from paprka/largebow
Readds large crossbow to protolathe
2014-10-08 10:18:51 +01:00
hornygranny
c28dd40190 Merge pull request #5085 from paprka/WYATTSHIELDS
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
paprka
4caea819a1 copy pasting is a bad idea 2014-10-05 15:30:31 -07:00
paprka
862eac9b23 sprite 2014-10-05 15:28:34 -07:00
paprka
d67e5a4810 readds large crossbro to protolathe 2014-10-05 15:20:10 -07:00
Cheridan
cd1cefdd7b Flash Update
MASSIVE CLEANUP of flash code.

Instead of Weaken(), flashes now add confusion, similar to being drunk.

Synth flashes removed.
2014-10-04 19:51:14 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
paprka
6d4fb1483a adds telescopic riot shields 2014-10-04 15:58:27 -07:00
Cheridan
7a2d6be197 Merge pull request #5049 from nivomi/master
Added examine descriptions to various objects
2014-10-04 14:37:53 -05:00
nobalm
6998162069 Added descriptions to objects
Descriptions were added to the following objects:
supply shuttle console, supply ordering console, air alarm, AI system
integrity restorer, cloning console, operating computer, prisoner
management console, AI display, exosuit control console, mech bay power
control console, inteliCard, labor shuttle console, mining shuttle
console, photocopier, PanD.E.M.I.C 2200, Circuit Imprinter, Destructive
Analyzer, Protolathe, Robotics R&D Console, R&D Server Controller
2014-09-30 23:43:07 -04:00
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07:00
Remie Richards
cc85f44ccb Merge pull request #4900 from MrStonedOne/erroageinjudgement
Fixes some "erros" in the database system
2014-09-26 23:41:37 +01:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
MrStonedOne
e21ed011af Fixes some erros in the database system
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
2014-09-19 13:37:58 -07:00
Cheridan
21dcbb0887 Merge pull request #4836 from Jordie0608/consistencyisthespiceoflifeliketurpentineisforenhancingcolours
Fixes #4722 Inconsistent formatting in RD machine warnings
2014-09-19 09:36:39 -05:00
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Jordie
b7d903fbda Adds \ back to DA nodrop message 2014-09-18 13:34:16 +10:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
Jordie
2bb0f348f4 notice > warning 2014-09-15 18:25:16 +10:00
Jordie
dd39346563 [name]ifies messages and removes debug item 2014-09-15 18:24:34 +10:00
Jordie
cd2cdde82e Spans unlinked message 2014-09-15 18:21:52 +10:00
Jordie
ef95f0094f Added span + [name] 2014-09-15 18:19:58 +10:00
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00