cib
76cee10c6a
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
baystation12.dme
2012-02-24 06:41:38 -08:00
cib
0612deab58
Bug fix #484 : The cocoa plant had 6 growth stages in its definition, but only 5 icon states. Changed the definition to 5.
2012-02-24 06:19:54 -08:00
Jimapples
5ee546ac44
CURRETS MAN CURROTS. replaced with something that makes sense.
...
Signed-off-by: Apples <chicken_face@ymail.com >
2012-02-20 22:42:38 +00:00
SkyMarshal
cd9b569dda
Fix for stupid.
2012-02-19 21:47:28 -07:00
SkyMarshal
37f39de861
CentCom doors are less hackable.
...
Clamped values on the regeneration superpower
Moved detective work to a modules subfolder
2012-02-19 21:09:11 -07:00
Melvin Melonstorm
b57f23bda4
Big toxins lab update! It's now way better, with two burn chambers and a
...
mixing and filtration room, along with a bigger observatory and an
'office' for plasma researchers, i.e. a table layout similar to the one
in chemistry. Instead of a chemical vendor, plasma researchers now got
their own custom vendor with assembly parts for bombastic bombs. The
maintenance tunnel's still kept between a double set of airlocks.
There is a problem with the vents and scrubbers of the office and burn
chamber room not being detected, though. (Miniature, Hawk, take a look
at it.)
2012-02-18 02:04:23 +01:00
SkyMarshal
b0eebb2edb
Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag.
2012-02-17 12:56:46 -07:00
Albert Iordache
cc6c63edd7
Merge pull request #423 from caelaislinn/master
...
added a couple of new clothing items, updated some sprites
2012-02-16 08:29:15 -08:00
SkyMarshal
b5c1d99471
Added some more feedbacks on the blood_DNA stuff
...
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
2012-02-14 21:34:52 -07:00
CaelAislinn
43ead88027
fixes to new clothing
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-15 07:04:26 +10:00
CaelAislinn
9d798d3f95
updated some sprites, added new clothing
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-15 06:58:50 +10:00
CaelAislinn
9ee093b70e
added a couple of new hats, updated some sprites
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-14 06:05:40 +10:00
Tastyfish
0dc9bc325b
upgraded medical console to be like sec console
2012-02-12 09:55:02 -05:00
Tastyfish
aeafc2ffa5
can eat all foods with fork like a sane person now
2012-02-12 07:07:16 -05:00
CaelAislinn
0edd231592
added new custom items
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-11 07:24:50 +10: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
463d078cd4
Added chemistry's big beakers to the supply pack.
...
Security vending machines now have Evidence Bag boxes.
2012-02-09 10:53:09 -07:00
CaelAislinn
b38922f163
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-02-08 18:16:09 +10:00
Albert Iordache
e96e8bc19d
Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm
2012-02-08 08:10:15 +02: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
Albert Iordache
7df0181e60
Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity
2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c
Cleaned up parts of the code, no other changes
2012-02-07 20:05:42 +02: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
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
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
d2eff85c17
Porting much of Aryn's stuff
...
-Sounds
-Detective Work
-Hallucinations
Tweaked server air alarm
Tweaked gibs
Working on de-derping surgery
Ported some BS12 stuff (stunned radio and adminwho)
Player's mind datum now holds their antagonist preferences.
2012-01-31 02:01:36 -07:00
CaelAislinn
a2a82c620d
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-01-30 04:26:29 +10:00
CaelAislinn
558f31dd0a
added power control module boxes and sprite, made orderable via qm (apc circuits)
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-01-30 04:24:59 +10:00
CaelAislinn
ed7aff55e0
added engine core + a bunch of engineering areas to Antiqua.dmm
2012-01-30 04:20:17 +10:00
SkyMarshal
f096580734
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-28 21:32:56 -07:00
SkyMarshal
820f3c1242
Merge pull request #324 from CIB/master
...
Stuff
2012-01-28 20:31:25 -08:00
SkyMarshal
21a648dc73
Added certificate of awesome, centcom stamp, removed broken gamemode
2012-01-28 21:30:43 -07:00
cib
f6dcb3d079
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-01-28 19:00:56 -08:00
cib
0b71628c05
Fixed a typo.
2012-01-28 18:35:22 -08: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
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
12afd61ffc
Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant.
2012-01-27 20:15:06 -07:00
Hawk-v3
6bf4e70727
Power Control Computer can now remote toggle APC main circuit breakers!
...
Codegift from Newt.
2012-01-28 02:40:38 +00: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
SkyMarshal
336284127b
Fixed a bug
2012-01-25 14:35:59 -07:00
SkyMarshal
81b8520c61
More flexible RCD ammo stuff.
2012-01-25 14:16:11 -07: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
SkyMarshal
1bf1d5db1f
Pimped out the response team. No jobs have stupid stuff spawn in their hands, it now spawns on their person, be it on their ear (pens if they cannot find a target) of in their pockets. MAde several pre-set-up things for the response team, including portable surgery equipment and a movable optable. Made autolathe items spawn on top of it. Added Death alarms, and made explosive implants work properly. Girders are now removed when a floor is made/RCD'd into existence. Internals can now be set even if it is in suit storage or on the belt.
2012-01-20 12:53:29 -07:00
vageyenaman@gmail.com
9cc379273e
TG update: Vending machine GUI overhaul.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2694 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-17 11:49:03 +02:00
SkyMarshal
0d7ce5f347
Port of the TG radio system. Tasty and I tested it out and it works smooth and clean :)
...
We were able to restore functionality after we blew up half the radio equipment, as well.
AI satellite is now the Comms satellite.
2012-01-17 00:12:30 -07:00
Albert Iordache
e3c4b0f88f
Merge pull request #276 from SkyMarshal/master
...
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
2012-01-12 11:43:39 -08:00
SkyMarshal
70cb3417ef
Added weldpack, clipboards fit on belt, food and other things can now be wrapped
2012-01-12 11:13:05 -07:00
Albert Iordache
25f7741772
Fixed a UI bug caused by the lack of var/over = 1 for PDAs
2012-01-12 16:58:46 +02:00
SkyMarshal
a47b399c32
Fixed bugs involving wrapping yourself in a closet. Added a new centcom uniform sprite, and added checks to keep them looking pretty. Added a cancel button to deathsquad button. Adjusted admin spawnable complete uniforms, so that centcom officials look pimp'n. Added a layer of internal armor (special invisible exosuit) that spawns on centcom officials. Centcom berets are no longer space helmets. Added missing reactive teleport armor sprite and fixed it's functionality.
2012-01-11 18:13:02 -07:00