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
SkyMarshal
99aa041f11
Fixed some bugs, map update for Antiqua.dmm
2012-02-23 00:13:34 -07:00
SkyMarshal
7631f9c32c
Fixed #460 , #456 , and #478
...
Cleanbot autopatrols now
Ghosts can see PDA messages, a PDA will show you the fingerprints if it is complete enough (Security scanner)
Display case can be repaired.
More update_clothing() calls
Disabilities have their own window, now.
Removed the genetics scanner, go use yer penlights!
2012-02-21 18:58:28 -07: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
b1537456d1
Merge pull request #480 from SkyMarshal/master
...
Bugfix
2012-02-19 20:48:15 -08:00
SkyMarshal
cd9b569dda
Fix for stupid.
2012-02-19 21:47:28 -07:00
CompactNinja
342a277b61
Merge pull request #477 from SkyMarshal/master
...
Added some delagging to the singularity, DNA superpowers all work, now.
2012-02-19 20:40:15 -08: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
SkyMarshal
feef637419
Delagged singularity.
...
It will now grab and slow down any humans when it tries to drag them in, and tell them:
"\red The singularity has you in it's gravitational pull! It's hard to break free!"
And adds 20 to their movement delay (can be adjusted later)
All the DNA superpowers work now.
Readded fatness as sprite only, can only be triggered by admins (some people were complaining about it being unavailible for adminstoff, so now they get a taste of how bad the sprite is.)
To trigger fatness, modify the "mutations" variable to a value of 32
2012-02-19 18:19:12 -07:00
Albert Iordache
09538ecc25
A few minor fixes.
2012-02-19 17:42:48 +02:00
SkyMarshal
b5415335d3
Fixed a few runtimes, added debug verbs to help find WTF is up with DNA and 'prints
...
Improved how disabilities are handled
Fixed some stupid from googol's "smallsize" power
2012-02-18 12:45:01 -07:00
SkyMarshal
a36982a677
DNA and chooseable disabilities! Yaaay!
2012-02-17 19:38:30 -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
SkyMarshal
eaf198539f
Fixed some f-d up paths.
2012-02-17 12:56:45 -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
8769fdd3fc
Merge pull request #432 from Tastyfish/master
...
ported in a bunch of the old food making stuff
2012-02-15 19:11:30 -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
95b521dede
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-02-15 07:04:43 +10: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
Tastyfish
badb7bd93f
Merge remote-tracking branch 'upstream/master'
2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109
porting old food stuff
2012-02-14 11:59:16 -05:00
SkyMarshal
f59fb6af94
More updates, added comfy chairs.
2012-02-13 23:28:12 -07: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
SkyMarshal
8b62eff01a
Cleaned up the fingerprint code
...
Added sanity checks to the clean blood proc.
2012-02-09 09:42:08 -07:00
SkyMarshal
7298e8619b
Adding in cut down hacktool for CE.
2012-02-08 13:33:55 -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
SkyMarshal
664c6b7dec
AI's can now understand pAI speech
...
Tidied up some.
2012-02-06 11:02:49 -07:00
CaelAislinn
87838c7cc5
Merge git://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/gamemodes/meteor/meteors.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/new_player/new_player.dm
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-07 03:28:09 +10:00
CaelAislinn
32a37c6001
fixed taj speak and taj whisper (not working over radio chat). use :j after the radio/headset commands to speak or whisper in tajaran (only taj mobs can speak / understand it)
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-06 21:27:27 +10:00
SkyMarshal
85ee6ae562
Fixed a warning with meteors, HAWK: COMPILE DAMMIT
...
Blood now works properly.
2012-02-05 11:52:42 -07:00
CaelAislinn
9c3e7171f3
fixed mechs being able to interact with things in the players inventory
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-06 04:27:41 +10:00
CaelAislinn
b1c66d2342
Merge branch 'master' of git://github.com/Baystation12/Baystation12
...
Conflicts:
code/WorkInProgress/Cael_Aislinn/MultiZ.dm
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-06 02:51:49 +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
Albert Iordache
ec77e9da19
Revert "More fingerprint fixes"
...
This reverts commit c11502eb53 due to a bug where blood appears on objects when the blood_DNA variable is not null.
2012-02-05 16:22:48 +02:00
SkyMarshal
c11502eb53
More fingerprint fixes
2012-02-04 23:12:53 -07:00
SkyMarshal
2074313f7f
Updates to cigarettes and cigars
...
Tables can now be thrown past
You can now put something in a disposal unit by throwing at it.
2012-02-04 18:24:22 -07:00
Miniature
51043ef9f8
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-02-03 20:29:16 +10:30
Miniature
4aa8f73128
AI freelook! I am no longer aware of any issues with it (other than one minor one involving it not removing the dim overlay sometimes, but that is very easy to ignore)
...
If someone goes over the map and fixes the camera coverage, I suggest we force AIs to use this (and I'll be making a thread about it)
2012-02-03 20:28:43 +10:30