Commit Graph

4401 Commits

Author SHA1 Message Date
Erthilo
4eea62f47c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-17 03:01:25 +01:00
Albert Iordache
a100fd78bc Bugfix for #1073 2012-05-17 00:55:38 +03:00
Erthilo
a3eea78724 Cleans up limb attachment code some. 2012-05-16 21:02:54 +01:00
ericgfwong@hotmail.com
b54822362a -Added WJohnston's scrubs to Medical Doctor lockers.
-Added two new syndicate bundles
-Reduced cost of thermals to 3 telecrystals (formerly 4)
-Singularity Beacons are now spawned from a smaller, portable device.
-CMO and QM jumpsuits made more unique.
-Updated Cargo Tech jumpsuit and sprite
-Edited Warden's jumpsuit striping to match his jacket
-Added WJohnston's CMO bio hood
-Bug fixes for Nodrak's Random button

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3599 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-16 06:09:32 +00:00
Erthilo
7023d9f79d TG: -Added security backpacks in Warden and HoS lockers
-Added spare Warden's jacket in his locker
-Some re-sorting of items in security lockers for convenience
-Removed leather gloves from hydro lockers
Revision: r3598
Author: 	 ericgfw...@hotmail.com
2012-05-16 00:11:45 +01:00
Erthilo
b2f098c39b Small fix for making cable restraints with exactly 15 lengths. Added using a wirecutter on a restrained person to quickly release them. 2012-05-15 23:31:44 +01:00
Erthilo
db3b96c0a7 Adds cable restraints that can be made from 15 lengths of coil, and fixes table grammar. Also reverts lockdown changes so it works for the Exodus for now. 2012-05-15 22:24:25 +01:00
Erthilo
d1ca234252 text() splatted out. 2012-05-15 19:33:06 +01:00
Erthilo
d43684f3db Fixes *most* coat storage problems. Only two visible slots and updates/closes correctly. 2012-05-15 19:24:09 +01:00
ericgfwong@hotmail.com
04c51f5ac2 -Added security backpacks in Warden and HoS lockers
-Added spare Warden's jacket in his locker
-Some re-sorting of items in security lockers for convenience
-Removed leather gloves from hydro lockers

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3598 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-15 05:24:29 +00:00
SkyMarshal
0b3be860cb Table smashing is now more interesting. 2012-05-14 21:24:22 -07:00
Erthilo
9d76032058 Adds logging to holodeck controls. Allows AI to toggle saferty on and off, unless emagged. Fixes mech weapons not firing. Add ADVANCED INTERROGATION TECHNIQUES (smashing peoples faces with tables). Grab someone once and then click on a table. Fixes sleep button not waking you up. 2012-05-15 03:57:56 +01:00
ericgfwong@hotmail.com
2b786bfd12 -Removed duplicate uniform from hydro lockers
-Added mini-hoes and leather gloves to hydro lockers. The mini-hoe is no longer a prized possession to fight over.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3597 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-15 00:48:47 +00:00
Erthilo
baf8647607 TG: -r-table parts are now made by using four metal rods on regular table parts.
-Removed r-table parts from the plasteel build menu.
Revision: r3594
Author: 	 ericgfw...@hotmail.com
2012-05-15 01:02:01 +01:00
Erthilo
51de17e8ad TG: Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes  Issue 283 )
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes  Issue 398 )
- Syringe gun attack logs added (Fixes  Issue 465 )

Work by QualityVan
- Nettle and Death Nettle force based on potency.
Revision: r3593
Author: 	 johnsonmt88
2012-05-15 00:58:12 +01:00
Erthilo
496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-05-15 00:51:50 +01:00
Erthilo
0a7c3f8538 TG: -New PDAs for roboticists and shaft miners.
Revision: r3589
Author: 	 d_h2...@yahoo.com
2012-05-15 00:41:30 +01:00
Erthilo
97141927ef TG: Fixed an issue where contraband crates could not be ordered and would prevent
other crates in the same shipment from arriving.

Generalised the crate contents randomisation code to allow for future random-
contents crates and avoid unnecessary copypasted code.
Revision: r3588
Author: 	 musketstgstation
2012-05-15 00:25:52 +01:00
ericgfwong@hotmail.com
c5e5a83a08 -r-table parts are now made by using four metal rods on regular table parts.
-Removed r-table parts from the plasteel build menu.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3594 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 23:11:26 +00:00
Erthilo
363dd54b7e TG: A few map fixes, plus new toilets, urinals, and showers.
All bathroom stuff is fairly WIP at the moment.
The toilet path has changed from /obj/machinery/disposal/toilet to
/obj/structure/toilet
Revision: r3586
Author: 	 petethegoat
2012-05-15 00:11:18 +01:00
SkyMarshal
b2d2bff7a2 Add the capability for the NT chatbot pAI to use the PDA's messaging function instead of the system it had been. Also, several bugfixes for runtimes. 2012-05-14 12:19:15 -07:00
johnsonmt88@gmail.com
d2736aa6ea Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes Issue 283)
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes Issue 398)
- Syringe gun attack logs added (Fixes Issue 465)

Work by QualityVan
- Nettle and Death Nettle force based on potency.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3593 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 16:47:19 +00:00
Albert Iordache
b2022e5333 Merge pull request #1053 from SkyMarshal/BugFixes
Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff.
2012-05-14 02:43:50 -07:00
SkyMarshal
be6368b71c Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff. 2012-05-13 23:18:02 -07:00
d_h2005@yahoo.com
afad989abc -New PDAs for roboticists and shaft miners.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3589 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 03:22:28 +00:00
musketstgstation@gmail.com
f6b2777313 Fixed an issue where contraband crates could not be ordered and would prevent other crates in the same shipment from arriving.
Generalised the crate contents randomisation code to allow for future random-contents crates and avoid unnecessary copypasted code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3588 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 00:48:27 +00:00
unknown
dd18725c8b Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-13 13:29:12 +03:00
Erthilo
1443df2beb TG: Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the
path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn

Revision: r3584
Author: 	 petethegoat

-New sound effects for circular saws and surgical drills.
-New sprites for mass-spectrometers and advanced mass-spectrometers.
-Sprites for empty bookshelves and book overlays added to library.dmi.

Revision: r3585
Author: 	 d_h2...@yahoo.com
2012-05-13 02:19:36 +01:00
Erthilo
7cc3b7fb43 TG: AutoUpdateTK lags tremendously. TK functions as it used to before Doohl gave it
a minibuff.
This is not to be added again until it someone rights a less laggy version.
Revision: r3580
Author: 	 rockdtben
2012-05-13 00:42:09 +01:00
Erthilo
be9ff4e9e1 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-13 00:33:07 +01:00
Erthilo
ab552e20d1 TG: Renamed access_medlab to access_genetics.
Gave the RD his genetics access back.

Added Invisty's hyperspace tiles.
Added Icarus's map updates (Sec, gateway room, genetics/RD access) ((this is a
big overhaul to sec)).
Added Flashkirby99's SMES sprites.

Updated the changelog.
Revision: r3576
Author: 	 petethegoat
2012-05-13 00:24:34 +01:00
Erthilo
2a0caf890d TG: - Added QualityVan's fix for large glass windows not requiring 2 glass pieces.
- Took 'Evolve Greater Changeling' off the Evolution menu. It still exists, it's
just hidden until it's finished (i.e. gets a sprite)
Revision: r3575
Author: 	 johnsonmt88
2012-05-12 23:27:24 +01:00
petethegoat@gmail.com
152eb3f29e A few map fixes, plus new toilets, urinals, and showers.
All bathroom stuff is fairly WIP at the moment.
The toilet path has changed from /obj/machinery/disposal/toilet to /obj/structure/toilet

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3586 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 22:21:32 +00:00
unknown
26b8eb33fd Minor stuff for photos
Making copiers copy them properly
New photos will appear in your hand, rather than on the ground
2012-05-12 23:25:35 +03:00
SkyMarshal
c43ee6dc57 Merge pull request #1037 from comma/master
Police tape overhaul
2012-05-12 12:28:41 -07:00
unknown
ed90684d2f Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-12 22:20:23 +03:00
unknown
9efafd39bd Police tape overhaul
General purge of copypaste code

Framework for easier adding of new tape types
Now you only need two sprites of roll and sprites of tape length (H and V)
Define them in police_tape.dm

To show it off, engineering tape added, passable by engineers and atmos techs

Last but not least - ability to lift the tape, allowing passage for pretty much everything.
Done by those with access, attack by empty hand on help intent.
2012-05-12 22:16:23 +03:00
Erthilo
64d5a2f033 Fixes crayons drawing without having a crayon. 2012-05-12 17:36:37 +01:00
Erthilo
aaa3e11993 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-12 16:42:54 +01:00
petethegoat@gmail.com
537e922249 Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3584 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 15:03:02 +00:00
SkyMarshal
502c66664c Some more work on FEA, WIP FEA/ZAS work, does not effect the game currently. 2012-05-11 18:06:21 -07:00
SkyMarshal
15d72e3b0e Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type. 2012-05-11 18:02:30 -07:00
Erthilo
035bc3541f Fixes contraband and arts and craft crate. 2012-05-12 00:12:15 +01:00
rockdtben@gmail.com
2838984bcf AutoUpdateTK lags tremendously. TK functions as it used to before Doohl gave it a minibuff.
This is not to be added again until it someone rights a less laggy version.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3580 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 22:42:40 +00:00
johnsonmt88@gmail.com
e20e769614 - Added QualityVan's fix for large glass windows not requiring 2 glass pieces.
- Took 'Evolve Greater Changeling' off the Evolution menu. It still exists, it's just hidden until it's finished (i.e. gets a sprite)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3575 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 03:33:43 +00:00
johnsonmt88@gmail.com
6951ec37ed Committed for Sieve:
Reverted dismemberment
- This is the majority of the files

Reverted the gun change
- You wont shoot yourself putting your gun away
- You don't have to fire off all of your shots before hitting someone with your gun

Reverted Tarajans
- As requested

Hotfix for the Holodeck.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3574 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 02:21:00 +00:00
CIB
232a3bacf9 Merge pull request #1016 from Erthilo/master
Mask changes, TG updates, sprites fixes, and custom items
2012-05-10 13:52:25 -07:00
Erthilo
bf5386288e Toggle mask code by Gaben/Spamcat. Custom items for staghorn and atmoicdog29. Airlock electronic fixes for research doors. 2012-05-10 18:18:21 +01:00
CIB
20d00a44d2 Merge pull request #1014 from Erthilo/master
Custom items for madmalicemccrea, searif, serithi, thebreadbocks, themij. Changelog too!
2012-05-10 09:18:04 -07:00
Erthilo
08191c824d Merge branch 'DetectiveWork' of https://github.com/SkyMarshal/Baystation12 into SkyMarshal-DetectiveWork
Notes:
Fucking hell. Makes the detective backend shit non-retarded. <3 Hashtables.
Map changes. Some improvements/adjustments to code to work with the map changes.

Conflicts:
	baystation12.dme
2012-05-10 16:48:01 +01:00