Commit Graph

7166 Commits

Author SHA1 Message Date
Laurence Reading d753d524c2 Attacking unanchored windows truns them into stacks of glass 2013-11-14 22:17:01 +00:00
Kyrah Abattoir b6cceb8ac7 vending system that use granular stock boxes 2013-11-14 21:57:36 +01:00
Fleure 05d5933137 Fixed being able to escape moving lockers 2013-11-14 18:42:13 +00: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
Aranclanos 2295080ea3 Merge branch 'medmech' of https://github.com/fleure/-tg-station into medmech
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2013-11-09 15:14:48 -03: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 5ad9505ef4 [MAP]Fixed space-fastening properly.
Conflicts:
	code/modules/power/singularity/field_generator.dm
	maps/tgstation.2.1.2.dmm
(What is this I don't even)
2013-11-09 14:42:54 +01:00
Miauw 58f021626b Cleaned up bugfixes. Committed musician.dm too, I accidently forgot that. 2013-11-09 14:11:40 +01: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
Fleure aaf68d2a12 Included additional structures to escape from 2013-11-05 00:26:30 +00: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
sirbayer c6c1dbd363 Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-improvedprojectiles 2013-11-01 20:32:04 -07: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
Aranclanos 0b5e2d3c17 Merge pull request #1662 from Giacom/doppler_array_tweak
The doppler array will now state the theoretical size of the explosion if it was uncapped.
2013-10-30 09:08:52 -07:00
Aranclanos 2888ade897 Merge pull request #1655 from Giacom/robot_violin
Added the space violin to the service cyborg modules + MORE [CHANGELOG]
2013-10-30 08:19:22 -07:00
Giacom 3efaff62ba Merge pull request #1668 from AndroidSFV/Fix633
Resolves #633
2013-10-29 14:42:56 -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
AndroidSFV 3144b54e92 Fixes #633. Problem was a null.loc runtime from the chair being disassembled. 2013-10-27 19:37:38 -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
Giacomand 9ad2d5b5c2 The doppler array will now state the theoretical size of the explosion, which is the size of the explosion if there were no bomb cap. 2013-10-27 12:45:02 +00:00
Fleure d4aa482ff1 Changed locker escape message usage 2013-10-26 20:07:26 +01: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
Giacomand 83b882ed3f * Added the space violin to the service cyborg modules.
* Made the space violin usable by service cyborgs.
* You can now examine Cyborgs to see their active module.
* Made the choose module window look nicer.
2013-10-26 13:49:41 +01:00
Cheridan 79c3db1977 Merge pull request #1639 from Intigracy/doesanyoneevencarewhatInamemybranch
Fixes landmark for plaguedoctor costume not spawning the mask.
2013-10-26 02:06:18 -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
supersayu 2395c3cad5 Replaces the border objects list with a temporary list in the proc. 2013-10-24 21:12:17 -04:00
Fleure 8eeafb70a7 Overrides statue resist proc 2013-10-24 22:25:29 +01:00
Fleure e3169ee8b9 Adds container resist proc 2013-10-24 21:30:01 +01: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
Intigracy 04feaa7361 Fixes landmark for plaguedoctor costume not spawning the mask.
Lame.
2013-10-23 22:13:40 -07:00
supersayu 758c98c9e5 Adds a border object list to turfs
This removes some unnecessary or redundant checks in turf/Enter().

Also fixes a movement glitch involving atoms moving out of an object (locker, etc) and into walls.
2013-10-23 16:20:21 -04:00
supersayu 799c7ad2ce Replaces atom/HasEntered() with the builtin atom/movable/Crossed()
Crossed() is a byond builtin which is called automatically when two movable atoms overlap (as a side effect of Move(), but not when loc or x/y/z is changed).  Previously, turf/Entered() iterated through all objects in the turf in order to tell them an object had entered; with this change, HasEntered() becomes redundant and can be eliminated.

This may reduce lag when a large number of objects are moving in a small space (singularity, mining conveyors, etc) but should cause no changes to functionality at all.
2013-10-23 16:20:20 -04:00
Cheridan 9996ded1f8 Merge pull request #1609 from Neerti/bedsheet_bug_fixes
[BUGFIX] Fixes two minor bugs with my bedsheet changes.
2013-10-23 10:59:00 -07:00
Cheridan 02b62b4bed Merge pull request #1616 from Aranclanos/RuntimingSongs
Fixes a runtime related to songs
2013-10-23 09:31:28 -07:00