Commit Graph

1168 Commits

Author SHA1 Message Date
Aranclanos
de11cd2934 for extra prettiness, the (x,y,z) coordinates on the game logs of transfer valves no longer have spaces between them. 2013-12-08 16:10:58 -03:00
Aranclanos
cd9778c7db Fixes the code not compiling. I blame myself. And everyone else. 2013-12-08 16:08:37 -03: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
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
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
Aranclanos
a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
2013-12-05 07:01:09 -03:00
Emil
e2a6628aec Removing href-tags from log_game in grenade.dm
Cleaning up after Ikarrus @ 2f92f67a
2013-12-03 21:33:58 +01:00
Emil
72e16e4482 Removing href-tags from log_game in transfer_valve.dm
Not sure I'm doing this the best way, but I couldn't come up with a cleaner way. Suggestions are welcome!
2013-12-03 16:54:38 +01:00
Rolan7
3e642f7adc Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroTweaksNov2013 2013-12-01 21:04:20 -05: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
Aranclanos
fc94341bce Removed the impossible NOBLOODY flag, replaced it with a simple proc. rejects_blood() 2013-11-28 05:45:49 -03:00
Aranclanos
3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2013-11-26 22:03:26 -03:00
Giacomand
852e5deb44 Merge branch 'master' of https://github.com/tgstation/-tg-station into camera_bug_sprite
Resolved Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2013-11-26 21:33:07 +00:00
Giacom
b0641be44d Merge pull request #1833 from kyrahabattoir/ItemNameFixingRound2
Item name fixing round2
2013-11-26 12:02:26 -08:00
Giacom
d7b6001f98 Merge pull request #1835 from Cheridan/NukePR
Scale Ops 1.1
2013-11-24 13:51:07 -08:00
Cheridan
2edbd69ce3 what is even the difference between w_class 1 and 2 anyway geez 2013-11-24 14:35:12 -06:00
Robson Richards
75ff8338b8 Fixes bible spam
Fixes "r_arm" nonsense
Fixes appendicitis carrying over to robotic chest
2013-11-24 15:24:55 +00:00
Razharas
a58b0169ae Tiny abstract flag improvement
By petes request made items with ABSTRACT unequipable
2013-11-24 06:16:22 +04:00
Cheridan
df9bc262bf Merge pull request #1798 from kyrahabattoir/vending-reloadedB
Vending reloaded!
2013-11-23 11:40:34 -08:00
Giacomand
3e3e193c79 Camera bug sprites from Rob 2013-11-23 17:10:43 +00:00
Aranclanos
0ec59be055 Adrenalin implants will now actually add their reagents instead of runtime and cry. 2013-11-22 01:47:18 -03:00
Cheridan
d814414227 Scale Ops 1.1
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
2013-11-20 17:59:02 -06:00
Kyrah Abattoir
225a906eda code/game/objects/items/* (root) lowercase pass
code/game/objects/items/devices/* lowercase pass
2013-11-20 19:15:00 +01:00
Kyrah Abattoir
e6ee419f47 ADDED costume restocking unit
REMOVED many useless comments
ADDED invoke vending_refill consutructor superclass

ADDED: Cargo can order the autodrobe supply crate
2013-11-18 19:15:23 +01:00
Kyrah Abattoir
6042dbe667 Merge branch 'master' into vending-reloadedB 2013-11-18 15:06:08 +01:00
Aranclanos
de227487a8 Merge pull request #1792 from Giacom/PDA_tweak
AIs can no longer intercept messages randomly. Captain PDA no longer starts off.
2013-11-17 22:34:03 -08:00
Razharas
b7b45881b2 Made abstract a flag and other stuff
Everything that had abstract var now has ABSTRACT flag
Everything that checked abstract var now checks ABSTRACT flag
Fixed some runtimes
Fixed click code and face direction changing while cuffed
Added del to all attack_* of the proboscis in case shit goes real
AStar is still weird so added  a simple sanity check
2013-11-18 03:53:50 +04:00
Robson Richards
e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff
This probably broke everything... :(
2013-11-17 18:09:14 +00:00
Kyrah Abattoir
4b002b2e7a Fixed some snowflakes in the examine grenade code and redundancies in their descriptions. 2013-11-17 14:59:48 +01: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
Robson Richards
637c3f7f63 Fixes for @Aranclanos
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
2013-11-16 18:13:41 +00:00
Kyrah Abattoir
94497eed78 Corrected typos and cleaned out description 2013-11-16 12:57:16 +01:00
Kyrah Abattoir
86a75bba95 Fixed paths for icons. 2013-11-16 12:01:29 +01:00
Kyrah Abattoir
40f17ebaf2 More code, vending machines cannot dispense while they are unscrewed. (might remove that)
Only the dmi files are missing now.
2013-11-15 20:26:39 +01:00
Giacomand
6b68a7245d * AIs can no longer intercept messages randomly. Instead they can use the Message Monitor by getting their cyborg to get the keypass.
* The Captain's PDA no longer starts off, instead their PDA is detonation proof.
2013-11-15 14:17:53 +00:00
Kyrah Abattoir
e11b05416b New system based on restocking points rather than fixed inventory. 2013-11-15 01:04:32 +01:00
Kyrah Abattoir
b6cceb8ac7 vending system that use granular stock boxes 2013-11-14 21:57:36 +01:00
fleure
364992496b Fixed nozzle not filling from sink. 2013-11-12 00:02:29 +00:00
fleure
c860235a51 Added watertank backpack and put on map 2013-11-11 19:08:37 +00:00
Cheridan
b2b9aea469 Merge pull request #1733 from JJRcop/borg-decon-dumb
Adds instructions to deconstruct cyborgs into Cyborgs for Dummies
2013-11-10 13:39:31 -08:00
Robson Richards
6587fe30cd Fixes an earlier attempt at the previous commit
Fixes a comment that was a DIRTY LIAR
2013-11-10 02:04:00 +00:00
Robson Richards
b2b6a9ff84 Fixes Chem healing and Chem damaging of Robotic limbs
Hey @Cheridan NO ISTYPES! :D
Ugh.. I mean "Removes" 10 totally unnecessary istypes
Fixes the healing of robotic limbs so that the message actually doesn't display now.

Credit to ACCount12 for digging around and finding some nifty code
that my brain never thought of
2013-11-10 01:55:40 +00:00
Giacomand
f7e662e883 Merge branch 'master' of https://github.com/tgstation/-tg-station into tele_sci_change
Resolved Conflicts:
	code/__HELPERS/game.dm
2013-11-09 18:43:55 +00:00
Giacomand
0c5cd7d8ac Telescience now uses projectile trajectories to calculate the tile to teleport to.
The user can set a rotation (the direction the teleport will send him), the power (the amount of power the telepad will use, basically the x velocity) and the angle (which is the y velocity).

The random factor is that the power is randomly offset everytime you recalibrate the telepad.

There is a delay between each use of the teleport, which is calculated by the time it takes for a projectile to hit a destination.
There is also a delay determined by the amount of power you use.

Added a manual for telescience, which links to the wiki.
2013-11-09 15:03:23 +00:00
Miauw
b6a35258ec RCD's "Change Airlock Settings" will no longer ask you weird shit. Fixed #232 2013-11-09 14:10:23 +01:00
JJRcop
685910cfd5 Adds instructions to deconstruct cyborgs into Cyborgs for Dummies 2013-11-09 00:43:51 -05:00
Giacom
9f5f30eb68 Merge pull request #1670 from Cheridan/Bugs
Bugfixes
2013-11-07 09:08:57 -08:00
Cheridan
c0566016d5 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1701 2013-11-06 11:03:40 -06:00
Cheridan
729dea43a2 Fixes up the implant removal messages, replaces names with paths in uplink_item.dm 2013-11-04 09:58:04 -06:00