Commit Graph

881 Commits

Author SHA1 Message Date
SkyMarshal
f5cfb1db2c Map fixes for the disposal unit some added to the HoS's office, and for the server room. 2012-02-10 15:20:11 -07:00
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff
Map update with secure doors!
2012-02-09 21:50:50 -07:00
CaelAislinn
03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-10 09:11:08 +10:00
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
CaelAislinn
22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 11:47:07 +10:00
CaelAislinn
3a60e2100e replaced missing atmos pipe in medbay maintenance
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 06:51:50 +10:00
CaelAislinn
70849af46c replaced missing wire in the counselor's office
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 04:59:34 +10:00
CaelAislinn
1366bf7e34 Merge git://github.com/Baystation12/Baystation12
Conflicts:
	code/defines/procs/gamehelpers.dm
	code/game/mecha/mecha.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 09:08:55 +10:00
CaelAislinn
06fad98469 fixed mech charge port bug, fixed (?) autolathe bug, miscellaneous map fixes
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 08:05:47 +10:00
SkyMarshal
16e38a6d7c Fixes for the map. 2012-02-06 12:16:56 -07:00
SkyMarshal
64e6baa669 Map update! Added perapsam's map changes, fixed up some derp in the brig. 2012-02-06 12:06:13 -07:00
CaelAislinn
2bc65eeb31 added erths computer sprites, fixed a missing window in the RD server room
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-06 04:40:06 +10:00
CaelAislinn
9e4539fdce most cameras on the station are now split up into networks. the larger departments all have camera computers to monitor their departments (security and ai can see everywhere). ai can now see multiple networks at once, legacy proc ai_network_change() now acts as a shortcut to let the ai jump to a specific network (picks a random cam in that network). cleaned up / added / removed numerous cameras all over the station to be in line with this update. all camera monitor computers can be built with a single camera circuitboard, simply click the circuitboard when in hand and select a department (must be authorised by a department head).
scattered minor updates, including removing unnecessary preceeding whitespace in the examine() verb.

added the tajaran as an adminspawnable race, see the forum topic for more information. features: new non-human (feline) playable mob, slightly more vulnerable to heat than humans, can speak in private language understood only by other tajarans (and possibly adept adminhackers), uses mob/living/carbon/human as a base template, so there will be unintended side effects (such as human hair overlays).
known bugs: ears/tail overlays, hud health (and temp?) display not updating, genetics will probably go haywire, speech bug means nothing can be said (high priority).

for the love of god, let this commit go through without trouble.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-06 02:46:00 +10:00
CaelAislinn
42c41c1ee9 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/unused/toilets.dm
	maps/tgstation.2.0.8.dmm
2012-02-04 22:36:42 +10:00
CaelAislinn
3698d4c85c added chemistry and genetics outer shutters, made all medbay shutters controllable via console in the CMO's office
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-04 15:39:40 +10:00
CaelAislinn
00d27645bc added a couple more cameras
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-04 07:06:56 +10:00
CaelAislinn
2d738b7fcd fixed a couple more cameras
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-03 22:09:35 +10:00
trubblebass@gmail.com
d5e55883fd TG Update: UTERUS MAP UPDATE! - Finished off the Atmos distro piping. - Finished off the AI upload foyer. - Added 10 sheets of Steel to Robotics and Engineering.
UP NEXT!
- Scrubbers loop (ugh!)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2707 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 08:44:38 +00:00
CaelAislinn
a8b1c6e66d fixed a camera bug, fixed a couple of camera placements around the map
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-03 13:48:55 +10:00
SkyMarshal
30c338077f Fixes for the AI beginning of round prompt, autolathe is now public access. 2012-02-02 13:47:51 -07:00
SkyMarshal
2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
2012-02-02 00:35:48 -07:00
CaelAislinn
f06890540a replaced missing power cable / pipe in robotics
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-02 00:48:24 +10:00
CaelAislinn
8eb550f794 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 18:18:04 +10:00
SkyMarshal
80be80a4c1 Bugfixes!
Fingerprint sanity checks
Mulebot sanity checks
Traitor objectives work, now
Some mapping errors fixed.
Attempted fix for solar tracking.
2012-01-31 15:00:46 -07:00
SkyMarshal
6648061dcb MAJOR UPDATE: Detective/Fingerprints update
bugfix for wardrobes
blood type is now handled by datum/dna, and blood_DNA for atoms is a list of list, each sub list containing DNA and blood-type. (This allows multiple blood splatters)
added BS12 give command and explosives
Map update to remove blob spawn.
2012-01-31 02:01:38 -07:00
SkyMarshal
5dba3ccf88 WIP on detective work overhaul
Give command ported, with more sanity checks (It works, now!)
Added BS12 c4 in addition to TG c4
Fixed server air alarm
Book length increased 3 fold.
Blood and gibs now maintains DNA
Fixed evidence bags
Ported the awesome BS12 handcuff stuff, with flavor text.
2012-01-31 02:01:37 -07:00
CaelAislinn
15ab34ca7f minor tweaks / grammar fixes
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 22:23:57 +10:00
CaelAislinn
a7437dafb5 added warning signs to antiqua engineering
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 04:47:09 +10:00
CaelAislinn
4e70418664 added station engineer start points and a blast door for secure storage
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 04:40:20 +10:00
CaelAislinn
a2a82c620d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-30 04:26:29 +10:00
CaelAislinn
ed7aff55e0 added engine core + a bunch of engineering areas to Antiqua.dmm 2012-01-30 04:20:17 +10:00
SkyMarshal
820f3c1242 Merge pull request #324 from CIB/master
Stuff
2012-01-28 20:31:25 -08:00
SkyMarshal
96588f1d88 Removed laser guns from Emaged sec borgs. Replaced with Toy Sword. 2012-01-29 03:24:52 -07:00
SkyMarshal
4b79c258b6 Map update: Adds wardrobes for all jobs + copiers and filing cabinets.
Modified surgery to work with autopsy
Adminhelp should go to the admin channel without being stupid
suicide tweaked so all antags can use it
You can no longer radio while stunned
More door fixes.
2012-01-29 02:16:18 -07:00
Mloc
2ba46244fd Compiling bugfix
Signed-off-by: Mloc <colmohici@gmail.com>
2012-01-28 10:57:54 +00:00
cib
e14dfc5ace Added autopsy.
- When a human is attacked, data about the weapon is added to a special wound datum on the organ.
- This data can be extracted and processed by opening up the limb and using an autopsy scanner on it.
- Added the autopsy-scanner to the map.
2012-01-28 02:26:44 -08:00
SkyMarshal
735bc0b6ad Derp. 2012-01-28 02:05:59 -07:00
SkyMarshal
3e9146f99a Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-01-28 02:03:42 -07:00
SkyMarshal
0e51764af4 Final load of bugfixes. Moved ported stuff to a subdirectory in Work in Progress, telecomms bugfix, fix for solar trackers, some human and monkey procs. 2012-01-27 22:55:16 -07:00
SkyMarshal
21fe68972f Lots of stuff, will elaborate later. 2012-01-27 11:18:14 -07:00
SkyMarshal
cd5e2476bd Added a new object, for storing premade outfits, that is in clothing closets.
Added clothing closets for several new jobs (Chef, Bartender, Virologist, etc.) and outfitted them.
Paper can now be burned, and acts as a hotspot and a light source when it is on fire.
Tweaked the Allinone broadcasters
Nerfed electrical storms
Response Team leader gets a special assignment/title.
Remapped to add Copiers, Filing Cabinets, and wardrobes
2012-01-26 22:19:33 -07:00
Albert Iordache
1a5d71faea Revert "map with water piping, bugfixes, optimizations"
This reverts commit 18be394e7c.
2012-01-27 10:05:32 +02:00
Tastyfish
18be394e7c map with water piping, bugfixes, optimizations 2012-01-25 22:17:14 -05:00
Hawk-v3
27beb7f3fd ERT edits.
Changed the chemical amounts and added some info to each team's section, plus cloner and Cure Machine to Shuttle.
2012-01-25 23:17:04 +00:00
SkyMarshal
d61626440c Response Team Update:
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
2012-01-25 11:51:55 -07:00
cib
f9cbc78790 Map error fix, and diseasedisk icon fix. 2012-01-22 22:14:55 -08:00
cib
e2e1cecd7d Changes to medbots.
- They now have a mode, which is enabled by default, in which they only inject chemicals if the chemical helps with the target's damage.
- You can now load and unload them without access.
- Added a few beakers of tricordrazine to robotics, so they can load medbots when they make them.
2012-01-22 19:22:07 -08:00
SkyMarshal
18bd946668 Finally fixed the access stuff for medbay. It was a bug introduced by Doohl.
Also made electric chairs amazing, but the sprite needs work.
2012-01-19 00:12:24 -07:00
SkyMarshal
bd97d9cdfd Latest TG radio update. Nuke agents can now hear all radio, which is intercepted to their frequency. Remapped some stuff making the Comm Sat actually accessible by people with access. 2012-01-18 11:14:20 -07:00
SkyMarshal
ded268cab9 Bugfix for ID access and map. 2012-01-17 08:48:01 -07:00