Commit Graph

9304 Commits

Author SHA1 Message Date
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
ericgfwong@hotmail.com 43f93a06c5 -Defined a new area for the prison wing, so ghosts won't teleport to the admin brig by accident
-Removed prison toilet disposals
-Reduced number of blast doors in prison wing, as it was overkill
-Fixes prison break event to also affect the prison wing
-Restores geneticists' supervisor text and headsets to include the RD
-HoP now starts with full access to his departments (all Supply and Civil)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3587 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-13 23:49:12 +00:00
Erthilo 9d5f0cce5c Fix for brig timer spacing. Minor grammar fixes. Fix for logged out people not staying asleep. 2012-05-13 23:50:27 +01:00
SkyMarshal bdc0de5fd0 Fixes numerous bugs from the Runtimes topic, more sanity checking on pipes and atmos stuff for the new FEA. 2012-05-13 13:52:40 -07: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
Erthilo f3e8997463 TG: Hotfix for the Holodeck.
Revision: r3574
Author: 	 johnsonmt88
2012-05-12 23:25:51 +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 dbbcefa9ca Adds logging for throwing living mobs and throwing items that hit living mobs. 2012-05-12 17:24:05 +01:00
Erthilo aaa3e11993 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-12 16:42:54 +01:00
Erthilo 0850cd8ba4 Prevents chameleon effects from entering teleporters, hotfix for mobs being deleted. 2012-05-12 16:40:26 +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 893529c69e Fixes some FEA stuff, for a general improvement to how well the system runs. 2012-05-11 18:19:00 -07: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
Hawk-v3 fc2a7f3a81 More Breakroom things, and a second Json fix. 2012-05-11 18:47:00 +01:00
petethegoat@gmail.com bec8e2cf37 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.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3576 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 12:28:02 +00:00
CIB 776a033252 Merge pull request #1020 from Hawk-v3/master
Trying to stop JSON -> WORLD dumps.
2012-05-11 01:42:03 -07: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
Lexus Langg 2ccf6e604a Created Industrial PACMAN generator with a Kirby sprite.
Made matching circuit board and R&D imprinter design.
My first real commit. =P

Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-10 18:55:27 -07:00
Hawk-v3 5a24d138b5 Trying to stop JSON -> WORLD dumps 2012-05-11 01:09:10 +01: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 238eb9de78 TG: Fixed Summon Guns spawning broken eguns. Replaced the decloner and freezegun
with aegun and mateba (for list of possible guns).

Added Ausops gateway sprite.

Added placeholder structures so the people working on the map have something to
mark where the recieving gate will be.

And unfinished Behemoth code because the dme needed to be updated to include
Ausops stuff.
Revision: r3572
Author: 	 kortgstation
2012-05-10 21:00:57 +01:00
Erthilo 340a86bbcc Chemistry moved to purely CMO's domain. RD's chemistry access removed. Slightly tweak title screen so the flare doesn't go off the edge (trust me it looks better) 2012-05-10 20:56:53 +01: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
Albert Iordache 71eec72e40 Merge pull request #1000 from comma/master
Photo Rework
2012-05-10 08:38:43 -07:00
Erthilo b25e3781cf Custom items for madmalicemccrea, searif, serithi, thebreadbocks, themij. Changelog too! 2012-05-10 16:38:38 +01:00
Erthilo 91a20e9811 Fixes a separate infinite loop error, as detailed here: https://github.com/ss13-daedalus/daedalus/issues/2
Credit to: @thvortex
2012-05-10 14:34:32 +01:00
unknown cc770f80b7 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	icons/obj/items.dmi - Resolved
2012-05-10 15:53:38 +03:00
unknown 0b53e20d6b Fixed issues with new pohto system
Wall mounted things are displayed correctly now
No more x-ray cameras
Bonus: You can reanme photos, and write things on it with pen

Signed-off-by: unknown <comma@nanotras-da0607.(none)>
2012-05-10 15:17:45 +03:00
Albert Iordache cdd50207aa Update to gameticker.dm, should fix the infinite loop problem. 2012-05-10 13:45:14 +03:00
kortgstation@gmail.com d15ce2c40d Fixed Summon Guns spawning broken eguns. Replaced the decloner and freezegun with aegun and mateba (for list of possible guns).
Added Ausops gateway sprite.

Added placeholder structures so the people working on the map have something to mark where the recieving gate will be.

And unfinished Behemoth code because the dme needed to be updated to include Ausops stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3572 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-10 05:33:01 +00:00
Erthilo 8aae642d83 TG: Some fixes for topic calls and inputs.
There's like 1001 things to fix so some of this is somewhat crude for now.

new helper proc located in procs/helpers.dm
reject_bad_text(var/text)
just feed any text in and it will either return the original text or null (if it
contains odd characters such as \ / < > or characters reserved by BYOND. It also
rejects if there are no non-whitespace characters)
Revision: r3571
Author: 	 elly1...@rocketmail.com
2012-05-10 03:02:56 +01:00
Erthilo 9b334464df TG: Cooldown on book printing actually works and is simplified.
Revision: r3569
Author: 	 quartz235
2012-05-10 02:55:25 +01:00
Erthilo 5b52e2ce64 TG: -Emergency Toolboxes now contain smaller, lighter fire extinguishers that
actually fit inside them!
Revision: r3568
Author: 	 d_h2...@yahoo.com
2012-05-10 02:52:05 +01:00
Erthilo f484bdfb52 TG: Minor cigarette fixes, and added the DromedaryCo cigarette crate as a new
contraband crate.
Also added WJohnston's new rolled up poster sprite.
Revision: r3566
Author: 	 petethegoat
2012-05-10 02:47:23 +01:00