Commit Graph

249 Commits

Author SHA1 Message Date
Giacom c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
Aranclanos 769e9dd9a7 Merge pull request #2137 from Rumia29/23/12/2013-rdaltuniform
Adds an alt RD uniform to the RDs locker
2014-01-10 00:52:09 -08:00
YotaXP f98a57b750 Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
Giacom 537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Cheridan 68362d7b49 fixing conflicts
THANKS GIA

:I
2014-01-02 10:04:22 -06:00
Cheridan 3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
Conflicts:
	code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
Giacom 542aca21f8 Merge pull request #2186 from Cluwnes/theunknownchicken
Gives the chicken suit head some inv_flags
2014-01-02 07:20:27 -08:00
Aranclanos 1e3f2c37a6 Removes the gag ball. 2014-01-01 23:43:01 -03:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Rumia29 e52a838284 Sprite Changes on request from Nienhaus 2013-12-29 20:46:37 -05:00
Cluwnes Honk df7fd3f98a Gives the chicken suit head some hiding flags
The chicken suit helmet now has the same inv_flags as a xeno helm.
2013-12-29 16:03:01 -08:00
Rockdtben c8bdf9420c Put this in the right place 2013-12-29 16:09:35 -06:00
Rockdtben 89faaaf999 Moved Speech Modification via masks to masks. say and whisper now call the speechModification(message) proc in wear_mask.
Moved derpspeech modification to mob_helpers.dm
2013-12-29 12:12:41 -06:00
Cluwnes Honk dec6e4cd89 Makes ninja gloves heat resistant.
Ninjas will no longer burn their hands on mere lights.
2013-12-27 15:45:27 -08:00
Cheridan 5d715da882 Merge pull request #2113 from Giacom/can_inject
[MAP] Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
2013-12-24 00:27:21 -08:00
Rumia29 7dcc92214c Adds an alt RD uniform to the code 2013-12-23 20:52:41 -05:00
Giacomand 375b9f08ea Fixes the flags of the beret. 2013-12-23 21:58:20 +00:00
Giacomand 28be6cfe98 * Fixes #2115 and the captain's space suit path was changed to /obj/item/clothing/suit/space/captain from /obj/item/clothing/suit/armor/captain
* Updated the map with the new path.
2013-12-23 13:41:50 +00:00
Giacom 38e0ae8848 Merge pull request #2019 from Jordie0608/Dogmas
Added reindeer hats
2013-12-23 04:18:42 -08:00
Giacomand c39f61fe27 * Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
* Fixes the space helmet not having the flag.
 * Fixes various coverall armour not having the THICKMATERIAL flag.
2013-12-22 01:43:03 +00:00
Aranclanos 58d0ed5221 Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
Security Sprite updates.
2013-12-21 15:24:14 -08:00
Bobylein fe0e995959 Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot. 2013-12-21 07:47:47 +01:00
Robson Richards f8c05e2169 Security Sprite updates.
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
2013-12-19 23:14:51 +00:00
Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Giacomand 1c5126fc98 Removed ONESIZEFITSALL.
Changed the THICKMATERIAL flag so it did not conflict with HEADCOVERSMOUTH.
2013-12-15 15:58:55 +00:00
Giacomand ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Giacomand 130803fcd9 * Added the THICKMATERIAL flag. It is used for thick coverall suits (space suits, firesuits, etc) and it will stop injections from syringes, hypos and parapens. It is also used for head items such as biohoods and space helmets. If you aim for the head, it will check if you can inject through the head equipped item, if you aim anywhere else it will check the external suit.
Let me know if I missed an item or if you don't think an item should have the flag.

* Cleaned up a bit of the gun code.
* Fixed an issue with shotgun darts not working in barrel shotguns.
* Made the on_hit() have a zone, will be used for syringe guns in another PR.
* Removed the unused sleepy pen.
* Changed /obj/item/weapon/gun/projectile/shotgun/pump/sc_pump to /obj/item/weapon/gun/projectile/shotgun/sc_pump, there was no /pump/ anywhere else.
* Shotgun darts will follow the new flag.
* Shotgun darts are now open containers, and I removed the snowflake check for them in syringes.
* Added logging for reagents in any projectile.
2013-12-13 00:00:20 +00:00
Jordie0608 9197bff4dd Added reindeer hats for humans and corgis 2013-12-11 16:11:01 +11:00
Aranclanos 8251c0ea42 Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013
Conflicts:
	html/changelog.html
2013-12-08 06:29:48 -03:00
Rolan7 e3d2f9ffe7 DONE Leather gloves now have heat protection like black gloves (to allow removing lights bulbs/tubes)
DONE	Plants require 4 light, mushrooms only 2
DONE	Harvesting should report how many items were harvested (whether plantbag is used or not)
DONE	Plantbag should have a mode to only pick up one kind of plant at a time.  Trash and ore bags too.
DONE	1 unit of mutagen should cause non-species mutations.  (Radium too)
DONE	Uranium should be like radium but even weaker
2013-11-28 23:07:50 -05:00
Malkevin 20964837d1 Forgot to add the flask to the tunic 2013-11-24 17:34:05 +00:00
Malkevin c3ab6146b2 Expanded the suit storage for the Captain's Tunic
Made the suit storage on the Captain's Tunic more useful than just a place to store your e-o2 tank.

You can now store the nuke disk, stamps, medal box, flashes and melee weapons (mainly intended for the Chain of Command), and of course - smoking paraphernalia
2013-11-24 17:25:25 +00:00
Kyrah Abattoir 560b50ec1b Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.
Added superclass invoke for the arcane tome

Added superclass invoke to light switches, removed it's (unused) description.

FLightswitch description repetition derp

examine superclass invoke for gas flow meter, space heater, fire extinguishers, grenades/IEDs, fancy boxes and welder. Changed description for welder and fire extinguisher to show their content in a similar style.

Fixed tank, linen bins and janicart description, and added welder of previous commit (forgot to commit it)

REMOVED icon in mop_bucket description (now provided by item class).
REMOVED unused examine() override in clothing/gloves
REMOVED custom examine() for glass/rag
CHANGED using examine superclass on paperwork/paperbin, removed redundant description code
CHANGED examine superclass for power/apc
ADDED universal maxcharge readout for all the powercell types.
CHANGED using examine superclass on machinery/light, removed redundant description code

FIXED weapon/virusdish use a description field.
TWEAK lowercased some of the portable generators.

Fixed improperness of pacman names
2013-11-16 22:15:50 +01:00
Cheridan 5ccbc0e1bd Merge pull request #1755 from Atskadan/chaplainrobes
Lets chaplains hold their religious items in their robes
2013-11-15 08:14:16 -08:00
Atskadan 432c51cc19 Adds holiday priest suit to the list, I forgot it. 2013-11-11 01:06:02 -06:00
Atskadan 3ac3a6adf5 Allows chaplains to hold religious stuff in their robes, also emergency oxygen tanks. 2013-11-11 00:56:32 -06:00
Atskadan 9384537436 Stuff 2013-11-11 00:30:05 -06:00
Cheridan c46fd846ce Merge pull request #1652 from Perakp/securityClothing
Security clothing crate
2013-11-06 15:12:36 -08:00
Perakp c4b6e8ba3c Changes Head of Security hat to lower case.
Removes useless jumpsuit hiding flags from security jackets.
2013-11-02 13:22:00 +02:00
sirbayer 19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
2013-10-30 17:56:00 -07:00
Perakp 37ada07863 Adds the blue versions of fashionable security outfits and a crate you can order from cargo that contains 2x officer, 1x warden and 1x HoS outfits. Crate cost 30 supply points is more than standard costume (10 points) and wizard costume crates (20 points), and cheaper than loyalty implant crate (40 points).
Also moves around security clothing items. For example HoS clothing was all in clothing/under/jobs/security, now every piece is in their respective category (under, suits, head). This doesn't change item paths.

Spelling fix in icons/mob/suit.dmi
2013-10-27 11:37:48 +02:00
Giacom 723c0ed3fd Merge pull request #1610 from VistaPOWA/roman_armour
Adds roman armour set and shield
2013-10-24 09:11:22 -07:00
VistaPOWA c188c2374d Adds roman armour set and shield
Made by troots.
2013-10-21 22:43:19 +02:00
Cheridan 7506a19073 Nuke Op Gloves: The Blackening
-Removes the yellow gloves on the Nuke Ops shuttle. (They were completely redundant, as the gloves they start with were already insulated (!!!)).
-In return, adds a laundry room to the nuke ops staging area, allowing them to paint their gloves as they please if they want to be stealthy.
-Removes 'SWAT' gloves in favor of the less-weirdly-specific combat gloves. Codewise, they were exactly the same.

Updates spacebattle.dmm, as it had an instance of swat gloves.
Adds a link in the mapmerge tool instructions to assist in setup.
2013-10-20 23:09:22 -05:00
Ergovisavi 7fd1465e17 Adds a new arg to explosion(), flame_range, for fiery explosions! Any mob in that range will be set on fire! Also creates some hotspots (mostly for ambience, won't generate them on existing space tiles) and changes the spawn explosion in the VV tab to let admins make fiery explosions.
Adds a cap for flame_range in global.dm
Added a flame_range for syndibombs, syndieminibombs, Wizard's fireball, fuel tank explosions, and meteors.

Adds firesuit level temperature protection to the wizard hardsuit for safety from your own fireballs setting you ablaze
Adds ExtinguishMob() for Ethereal Jaunt to make wizards a little less vulnerable to fire
2013-10-10 18:46:47 -07:00
Mloc-Argent 79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Malkevin a111635227 Sec Hailer: Day 1 bug fixes
Added a check to the verb to prevent dead people and ghosts using the masks

Changed the obj sprite for the black mask's eyes from purple to green, to match the mob sprites
2013-09-21 18:37:48 +01:00
Pete Goodfellow 78bbe6eaf7 Merge branch 'master' of github.com:tgstation/-tg-station 2013-09-21 14:46:07 +01:00
Pete Goodfellow bbe26823b1 Merge branch 'femoutfits' of github.com:Incoming5643/-tg-station into unifroms
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
2013-09-21 14:33:08 +01:00
Cheridan cb3de0d038 Merge pull request #1371 from Malkevin/sechailer
Sechailer mask (now finished)
2013-09-20 13:47:12 -07:00