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
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
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
Cheridan
637e7f72c9
Nuke Op Population Scaling and Content Update
...
to be edited
2013-11-03 16:41:57 -06:00
AlexanderUlanH
87b72833bd
Added the labor shuttle
2013-11-02 15:16:39 -04:00
Robson Richards
78ee2d0c32
Updates code/game/objects/items/stacks/medical.dm - Woopsie.
2013-11-01 19:50:09 +00:00
Robson Richards
a9b725db2f
Lot's of stuff, Read full Commit log
...
Cybernetic limbs
Multi-location operations
Limbs have sprites now (They never dropped before so it was irrelevant)
No Organic healing of Robotic limbs (But the message is still there, fixing soon)
No "organic" diseases in Robotic areas
No more operations in robotic areas - Cheer's Pete for the surgery system being so nice
Healing Robotic limbs with welders (brute) and cable (burn)
Probably other things I forget
2013-11-01 19:44:07 +00: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
Cheridan
a501cefb32
Merge pull request #1666 from Neerti/10-27-2013_nukeops_belt
...
New 'Military Belt' for nuke ops.
2013-10-28 20:51:36 -07:00
Giacom
bafd52f8da
Merge pull request #1650 from AndroidSFV/fix230
...
Resolves #230
2013-10-28 05:40:37 -07:00
Cheridan
bad46f62ba
-Fixes issue 1462
...
Adds an update icons call to cloakers
-Fixes issue 1387
Clonees get healed of all damage types while in the pod.
2013-10-27 22:02:22 -05:00
Neerti
2417c72307
Adds a new belt, intended for nuclear operatives to use. New 'military belt' and sprites added.
2013-10-27 19:44:29 -04:00
Giacom
eac041f23f
Merge pull request #1614 from JJRcop/mmi-extract
...
Adds the ability to safely deconstruct cyborgs
2013-10-26 11:28:24 -07:00
AndroidSFV
160e981a1a
Fixes #230 . Problem was with formatting of the output.
2013-10-25 11:53:52 -05:00
Aranclanos
a2981e5f9c
Merge pull request #1589 from SuperSayu/clickstuff3
...
Mecha, hud, and click fixes
2013-10-25 09:16:54 -07:00
Giacom
c169113e6b
Merge pull request #1636 from SuperSayu/starcrossed
...
Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter()
2013-10-25 04:24:42 -07: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
