Commit Graph

241 Commits

Author SHA1 Message Date
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
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
Aranclanos 53b938f1c3 The RnD console won't break anymore when the floral gun is possible to build. 2014-09-12 07:35:21 -03:00
Firecage 0948391502 Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research 2014-08-23 02:02:46 +02:00
Aranclanos b0f0d01d36 Merge pull request #4427 from Cheridan/blow_up
Advanced Shotshells
2014-08-17 15:35:08 -03:00
Cheridan 148d16397b Advanced Shotshells
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi

meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate

splits RND designs up into their own files
2014-08-14 12:15:10 -05:00
scoopscoop e96f01816c As with the autolathe, the protolathe now builds faster with better manipulators. 2014-08-14 01:58:46 +03:00
scoopscoop f5b5c7c84f Clamp function fixed 2014-08-13 19:30:35 +03:00
scoopscoop d521e6e827 Avoids division by zero 2014-08-04 15:58:30 +03:00
scoopscoop 327086b607 Allows the protolathe to build multiples of items. 2014-08-04 15:39:54 +03:00
unknown 0ebb633a16 Mining Machines: Implementing ex_act()
Implemented ex_act() in both the ore redemption machine and the mining
vendor. Sparks were added as a feedback for any explosion that call
ex_act() on these machines.
To allow for the reconstruction of these devices, I have implemented
machine recepies and circuitboard definitions for these devices. I also added
R&D recipies for the circuitboards.
Offline and Open icons have been added for both objects.

Squashed all of my previous commits and fixed the leftover garbled code
from my original rebase.
2014-07-20 01:11:06 -04:00
Alex 2830c8c092 Merge pull request #3961 from paprka/ergoisbackohno
Improved mining droprates
2014-07-07 10:28:30 +01:00
Miauw 71e1b38eb5 Adds slot machines. 2014-07-03 19:50:22 +02:00
paprka c21b6b0e55 sample text 2014-06-20 11:28:48 -07:00
Kelenius 3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Cheridan 36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck
Meteor Stuff
2014-05-17 18:42:16 -05:00
Alex 8aaa5a4b19 Merge pull request #3602 from GunHog/Advanced_HUDs
Adds Nightvision Medical and Security HUDs!
2014-05-14 11:06:03 +01:00