Commit Graph

318 Commits

Author SHA1 Message Date
Cheridan 8aaf10feb4 Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets
Gun Revamp 2: Gun Harder: Director's Cut
2014-01-14 11:10:05 -08:00
Cheridan a3760dfba1 Merge pull request #2311 from fleure/spider
Added spider meat, meals, and butchering
2014-01-13 14:21:20 -08:00
sirbayer eb20908dcf Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets 2014-01-13 14:08:57 -08:00
fleure a426dd8e6f Added spider meat recipes 2014-01-10 21:04:34 +00:00
Mark Aherne (Faerdan) 53b2d2e928 NanoUI Update
* Refactored the code used in the ui_interact procs to be neater and easy to understand (also less code duplication). Updated all existing ui_interact procs to match.
* Rebuilt (and simplified) template rendering system, removed data-linking (the use of carets "^" in templates) and the need to send the full data structure every update (just send whatever you want now, it's fully dynamic). Updated all existing templates to match.
* Restructured HTML and JavaScript to increase compatibility with IE (this fixes "blank uis" for many users).
* Increased the number of error messages to help diagnose issues.
* Multiple performance improvements, especially when updating an open ui.
* Added the ability to update a ui for an individual user (nanomanager update_user_uis proc, used for things like realtime messages in Bay's PDA).
* Added a "Loading..." notice to the UI. If this stays then your JavaScript isn't enabled.
* Removed redundant wip apc.tmpl file.
* Added a link to the online docs in TemplatesGuide.txt.
2014-01-09 01:02:13 +00:00
sirbayer 45cb745b6b Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
Conflicts:
	code/modules/projectiles/guns/magic.dm
2014-01-06 17:59:15 -08:00
sirbayer efb480005d Syringe guns can suck it. 2014-01-02 16:18:48 -08:00
sirbayer d502cc86ea Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
Conflicts:
	code/modules/projectiles/guns/magic/wand.dm
2013-12-30 16:39:12 -08:00
sirbayer a0a73d1ab5 Jesus Christ it compiles 2013-12-30 16:30:36 -08: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
Miauw 9e40407906 Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks
Conflicts:
	code/modules/reagents/reagent_containers/food/condiment.dm
2013-12-22 15:19:23 +01:00
Razharas 5e3997e0e2 Fixes chem dispenser properly
Fixed #2051
2013-12-20 00:30:35 +04:00
Cheridan fbe24b46ac Merge pull request #2071 from Giacom/viro_streamline
Virology Feedback Tweaks
2013-12-19 10:51:08 -08: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 8e9c5c19c8 * Set the cooldown, for creating virus culture bottles, from 100 to 5 seconds.
* Bottles spawned through the Pandemic will have a random pixel_x/y.
 * The recipe to remove a symptom from a virus (synaptizine + blood) will now only require 1 unit of synaptizine.
2013-12-18 17:33:03 +00:00
Razharas 358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Giacomand 4bfc5be6d4 * Quick fix to combat hypos still giving an error message when they are able to inject. 2013-12-13 22:59:11 +00:00
Giacomand 4b4735fb22 Made changes based on feedback.
The pen/hypo/borghypo doesn't give a poke message when it fails to inject someone wearing protective gear.
Fixed a typo.
Reworded the can_inject() error message for humans so it makes sense with a normal pen.
Made the combat hypo (nuke ops item) ignore protective gear, to allow syndies to heal their comrades.
2013-12-13 22:51:44 +00:00
Giacomand eb61c70cb3 Merge branch 'master' of https://github.com/tgstation/-tg-station into centcom_typo 2013-12-13 21:19: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
Miauw 520a4cc753 Fixed sprites. 2013-12-13 20:14:21 +01:00
Miauw 465bdb2334 Compile testing is for skrubs. (Condipacks compile now) 2013-12-13 20:00:29 +01:00
Miauw 8b3aba5b2c Fixed condipack issues 2013-12-13 19:54:59 +01:00
Giacom b0c36c2709 Merge pull request #2005 from ACCount12/master
Syringe gun - now 80% more gun! Fixes #1935
2013-12-12 16:16:16 -08: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
Giacom caa8190d61 Merge pull request #1994 from cem/chem
Increase Chem Dispenser window height
2013-12-09 08:30:03 -08:00
ACCount 5fde461f1e Syringe gun wants to be real gun! 2013-12-09 21:40:51 +12:00
Cem Kocagil d29f583062 Increase Chem Dispenser window height 2013-12-08 18:34:59 +02:00
Aranclanos 552c77fd81 Merge pull request #1990 from VistaPOWA/aluminium
Replaces 'aluminum' with 'aluminium'.
2013-12-08 07:32:54 -08:00
Aranclanos 498ba1acd4 Merge pull request #1964 from Limeliz/href-fixes-round-3
Href fixes round 3
2013-12-08 07:10:15 -08:00
VistaPOWA 1041d7081d Replaces 'aluminum' with 'aluminium'.
Hopefully there won't be a grammar war because of this.
2013-12-07 14:42:25 +01:00
Emil a56336a621 Update grenade_launcher.dm
Removed href-tags from log_game and corrected the log message.
2013-12-03 09:35:32 +01:00
Aranclanos d4a4a817d4 Merge pull request #1922 from TZK13/Mushroom-Adjustments
Adjustments to mushrooms
2013-12-02 12:41:34 -08:00
TZK13 e4de436a1e Renamed psilocybin to mushroom hallucinogen, removed psilocybin/mushroom hallucinogen from huge mushroom slice, removed space drugs from reishi, added anti-toxin to reishi and lowered the amount of sleep toxin in reishi. 2013-11-28 00:15:56 -06:00
Giacomand 61a7049cd7 Viruses are less random and you can determine the level of symptom you would get. Virus food will generate low level symptoms, Mutagen will generate medium level symptoms and Liquid Plasma will generate high level symptoms.
Virologist starts with a small bottle of liquid plasma.
Filled in the gaps between the chem master with RGBA(255, 255, 255, 1) so you do not accidentally click on the floor anymore.
ChemMasters now has the green light overlay, which is only used by Pandemics but it looks better than red.
2013-11-26 19:33:39 +00:00
Miauw 67d045c9ab Integrated Aru's condipack sprites and made the dinnerware vendor dispense ketchup and hotsauce packs. 2013-11-24 15:36:24 +01:00
Cheridan c1afd57b9b Merge pull request #1809 from Giacom/telesci_easymode
Telescience Change
2013-11-20 10:13:24 -08:00
Giacomand 602a2772d2 Another grammar thing. 2013-11-17 19:35:04 +00:00
Giacomand 99fa92e9c6 * Made wet floors use a static overlay.
* Standardized the wet floor code, it is now called MakeSlippery(var/wet_setting)
 * Added the wet floor static overlay, which is just a single frame of the usual animation.
 * Made the floor randomly dry (by a few seconds apart), for visual effect.
2013-11-15 17:28:04 +00:00
Cheridan 16b2bc833f Merge pull request #1753 from Giacom/tele_sci_tweak
Telescience Update
2013-11-14 15:30:01 -08:00
Giacomand b8c031026c * Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.
* The telescience computer starts with 3 artificial crystals.
 * The crystals can be crushed to blink or you can throw it at someone to make them blink a short distance.
 * You cannot teleport the AI or any anchored mob (unless they are buckled to an office chair).
 * You can make the bluespace crystals from slimes or from research.
2013-11-12 14:24:56 +00:00
Miauw 609b05424c Condiment packs are mostly working. Still no sprites. 2013-11-11 16:43:10 +01:00
Cheridan 94e4574c9a Merge pull request #1744 from fleure/lemonlime
Adds sprite for lemon-lime in a glass
2013-11-10 20:34:17 -08:00
Miauw ec0e555ed0 Added food bags. (Sprites don't work yet) 2013-11-10 21:34:42 +01:00
Fleure bd9b00ebb8 Adds sprite for lemon-lime in a glass 2013-11-10 00:26:18 +00:00
Giacom c25f14e74d Merge pull request #1659 from sawu-tg/master
Food additions
2013-11-09 13:24:29 -08:00
Cheridan 637e7f72c9 Nuke Op Population Scaling and Content Update
to be edited
2013-11-03 16:41:57 -06:00
Giacom d77963bc43 Merge pull request #1683 from Miauw62/borgshaker
Improved cyborg shakers.
2013-10-31 05:56:05 -07:00
Miauw e543604d2b Improved the new cyborg shaker. 2013-10-30 21:55:05 +01:00
Cheridan f9907e5fce Merge pull request #1674 from Giacom/dis_tiny_fix
Validates the spray bottle is still on the user when emptying.
2013-10-29 23:14:05 -07:00