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
baloh.matevz
9028fc227f
A simple wallet storage item has been added that can hold 4 small items. The items it can store are defined in a list
...
It however includes spacecash, cards (id, data, emag), cigarette, penlight (+ parapen), seeds, ointment, bruisepack, crayon, coins, dice, implanters, lighter, match, paper, pen, photo, dropper, screwdriver and a stamp.
Sprites by Aru
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=4548&start=40#p36594
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3034 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 01:13:13 +00:00
SkyMarshal
63c712fb3f
Merge pull request #359 from SkyMarshal/master
...
Bugfixes
2012-02-04 16:26:38 -08:00
SkyMarshal
1d7b00a0fc
Bugfixes for adminhelp and the Power Offline event.
2012-02-04 16:20:19 -07:00
baloh.matevz
4c92d1c152
Added a cheap lighter so that zippos will have some company.
...
The cheap lighter can be purchased at vending machines and comes in 4 colors: green, yellow, cyan and red.
Technical info:
The path
/obj/item/weapon/zippo
was changed to
/obj/item/weapon/lighter/zippo
The new lighter is
/obj/item/weapon/lighter/random
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3033 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 22:23:42 +00:00
CIB
2ff681d8c4
Merge pull request #358 from SkyMarshal/master
...
Fixes for *custom v/h emotes, as well as some other stuff.
2012-02-04 13:23:10 -08:00
SkyMarshal
7a4b21382e
Fixes for *custom v/h emotes
...
Blood type is now a variable of the DNA datum
Fixed runtime from blood
Fixed the AI prompt being missed.
Added breath holding.
2012-02-04 14:17:17 -07:00
baloh.matevz
cd85e48c4a
The job selection page has been changed a little:
...
Screenshot:
http://www.kamletos.si/job%20selection%203.PNG
Added this to the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3032 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 21:09:11 +00:00
baloh.matevz
0fa1f3d924
Examining humans is now smarter and displays only the things you can see. Certain outerwear suits and helmets hide other pieces of clothing on you.
...
A diagram that displays what can hide what:
http://www.kamletos.si/inventory%20visibility%20hierarchy.png
Note that not all suits and helmets hide stuff.
Added this to the changelog.
Technical information:
Renamed gimmick.dm to z_gimmick.dm because whenever I doubleclicked on any piece of clothing in the object tree it always pointed me to some random gimmick item instead of the root definition. Now the file is at the bottom of the folder and so everything else is looked up first.
Created a bitflag variable which is used to determine which piece of clothing hides another. The variable is flags_inv and the flags it contains are:
#define HIDEGLOVES 1 //APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESUITSTORAGE 2 //APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDEJUMPSUIT 4 //APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDESHOES 8 //APPLIES ONLY TO THE EXTERIOR SUIT!!
#define HIDEMASK 1 //APPLIES ONLY TO HELMETS!!
#define HIDEEARS 2 //APPLIES ONLY TO HELMETS!!
#define HIDEEYES 4 //APPLIES ONLY TO HELMETS!!
The first 4 only apply to exterior suits and the last 3 only to helmets, so they can use the same numbers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3031 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 20:09:46 +00:00
cib
d121b740d1
Added Erthilo's bone gel and bone setter sprites.
2012-02-04 11:59:46 -08:00
CaelAislinn
b1f5183d61
fixed extra whitespace in the examine verb
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-05 01:49:34 +10:00
quartz235@gmail.com
29db1914cd
Committing this for RavingManiac
...
- Newscasters now flash for one minute after a new story is posted
as seen in http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=7690
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3030 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-04 14:43:34 +00: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
Albert Iordache
f11876662e
Fix for a book related runtime error.
2012-02-04 12:12:22 +02:00
Albert Iordache
97883f63c2
Fix for an atmos runtime error.
2012-02-04 11:38:26 +02:00
Tastyfish
9072a0e760
Merge pull request #352 from Hawk-v3/master
...
TG Updates CHECK THIS
2012-02-03 18:25:27 -08:00
Tastyfish
d46846c1a5
Merge pull request #355 from SkyMarshal/master
...
Radio alert on singularity containment failure now goes to the Engineering Channel.
2012-02-03 17:04:02 -08:00
SkyMarshal
44c235a529
Radio alert now goes to engineering channel.
2012-02-03 18:02:22 -07:00
Tastyfish
7f70a3d2b2
Merge pull request #354 from SkyMarshal/master
...
Makes the announcements come AFTER the events, adjusted the Power Offline event.
2012-02-03 16:50:44 -08:00
SkyMarshal
3254aa10d8
Adjustments to events
...
Adds alarm for the singularity containment field.
2012-02-03 17:48:35 -07:00
trubblebass@gmail.com
d775d010d6
- Fixes an incorrect object path for the E-Crossbow that was causing RnD stuff to crash.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3029 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 23:25:14 +00:00
Albert Iordache
91b2274aaf
Merge pull request #351 from Miniature/master
...
AI freelook finishing
2012-02-03 10:01:41 -08:00
Hawk-v3
3f45c881e2
Removing something for sky.
2012-02-03 17:59:49 +00:00
SkyMarshal
c1ea1d0a97
Fix for HERP DERP LAG.
2012-02-03 10:51:52 -07:00
Hawk-v3
e4905ae1af
Patching for a item file. Please, check this. Deny if it isn't needed. I tried to make it work.
2012-02-03 10:54:25 +00:00
quartz235@gmail.com
5c46b1751b
TG Updates: Fixed being unable to finish AI creation
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2710 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 10:42:25 +00: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
baloh.matevz
bb64b63687
TG Updates: Coded in a round-start hierarchy displayed to you when you are assigned a job.
...
So the text you now see at the start is...
The current game mode is - Traitor!
There is a syndicate traitor on the station. Do not let the traitor succeed!
You are the Chemist.
As the Chemist you answer directly to the chief medical officer and the research director. Special circumstances may change this.
Added this to the changelog.
If other servers wish to change this they can just do so by editing the supervisors variables in the files in
code/game/jobs/job/
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2709 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 09:33:56 +00:00
quartz235@gmail.com
5f9fa90a90
TG Updates: Fixes: Issue 241 Issue 237 and Issue 240
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2708 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 08:55:24 +00:00
vageyenaman@gmail.com
d908f7f468
TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits.
...
▫ Capitalized some letters in the security level messages. Because that really annoyed me!
▫ Merged Donkieyo's patches with the master branch. (Forum post: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=7051 )
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2706 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 08:09:32 +00:00
SkyMarshal
37ac7e31ee
Hallucinations.
2012-02-02 21:53:08 -07:00
SkyMarshal
4290c35af8
Several detective fixes. 3 hour tape recorder.
2012-02-02 21:41:30 -07: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
a2237a10dc
Fixes for singularity beacon glitching
...
further gibber fix.
Ghosts can no longer print autopsy reports
Shrunk evidence bags so they can be put in lockers.
2012-02-02 19:59:15 -07:00
SkyMarshal
0e15736ba9
Fixes for gibber and detective computer.
...
Fixed some hallucination and fingerprint stuff.
2012-02-02 19:30:12 -07:00
trubblebass@gmail.com
6b23587fb6
Comitted on behalf of BubbleWrap
...
- Boxes can now be collapsed down into cardboard sheets.
- Cardboard sheets are stackable (like glass and metal).
- Cardboard sheets can be made back into boxes when needed.
- Cardboard sheets can also be made into a cardboard cyborg costume.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3028 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-03 01:06:41 +00:00
SkyMarshal
20d5879c78
Derp.
2012-02-02 13:57:33 -07:00
SkyMarshal
30c338077f
Fixes for the AI beginning of round prompt, autolathe is now public access.
2012-02-02 13:47:51 -07:00
Hawk-v3
303b760874
Merge pull request #348 from SkyMarshal/master
...
Bugfixes and updates to fingerprints
2012-02-02 11:29:32 -08:00
SkyMarshal
3b9efc849e
Updates to fingerprints/bugfixes.
2012-02-02 12:22:46 -07:00
Hawk-v3
27b43d532e
Merge pull request #345 from SkyMarshal/master
...
Hallucinations and final parts of the fingerprint system
2012-02-02 10:42:45 -08:00
CaelAislinn
28aa5d0a9f
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2012-02-03 03:51:45 +10:00
CaelAislinn
5dda37f25f
tweak to mech bays, shouldn't affect the current map
...
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au >
2012-02-03 03:50:36 +10:00
Miniature
1b08b0412a
Merge pull request #347 from Miniature/master
...
People can now cut wires in doors again
2012-02-02 09:43:30 -08:00
Miniature
00ef9657a2
People can now cut wires in doors again
...
Whoever coded using glass shards or wirecutters is an idiot who doesnt test shit
2012-02-03 04:04:59 +10:30
Albert Iordache
9c8b58c6ca
Merge pull request #344 from Tastyfish/master
...
photos & pages in books, book binder much better, books show author ckey
2012-02-02 07:12:55 -08:00
Tastyfish
4fcda439a7
doing a custom vote, aborting it, and starting a new one appended the choices to the choices of the old one.
2012-02-02 04:38:55 -05:00
SkyMarshal
16ac8ba8e0
Bugfixes.
2012-02-02 01:45:35 -07:00
SkyMarshal
3087c5d2e6
Hallucinations are 50x creepier now, thanks Mr. Fox.
2012-02-02 01:13:49 -07:00