cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 16:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,436 Commits 2 Branches 1 Tag
0cfaf8e70b51b46b15e82a3839ee0c7400bb6537
Commit Graph

10100 Commits

Author SHA1 Message Date
petethegoat@gmail.com
eccfc3ed3f Committing Rolan's MMI suicide/ghosting fix. Fixed issue 143. 
Comitting Nodraks's ghost ears toggle preference.

I also removed the underwear option, as it could not be toggled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3038 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-05 19:57:08 +00:00
CaelAislinn
1593a4923e new characters' jobs are now announced by the arrivals computer 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 05:26:41 +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
SkyMarshal
24d42f0ef8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-05 11:23:58 -07:00
SkyMarshal
429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
CaelAislinn
14f0f8418c readded scary sound files. got somehow removed from the git tracker 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 03:41:11 +10:00
petethegoat@gmail.com
2c3c7c2c6b Added in throwing stuff into disposals, courtesy of SkyMarshal. 
(technically this is a hotfix, as I accidentally committed it in r3036.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3037 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-05 17:40:12 +00:00
petethegoat@gmail.com
2c58840a4f Added throwing items over tables, thanks to SkyMarshal. 
Improved cigarette code, mostly grammatical fixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3036 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-05 17:22:39 +00:00
CaelAislinn
5a4fa7c889 returned pregame time to 180 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 02:56:14 +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
polyxenitopalidou@gmail.com
a1d54e2270 •No. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3035 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-02-05 15:29:04 +00:00
Albert Iordache
b2120f22e9 Merge pull request #368 from CIB/master 
Erthilo's sprites
 2012-02-05 06:23:39 -08: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
Hawk-v3
36e51a9fd4 ARGH METEORS 2012-02-05 13:04:03 +00:00
Tastyfish
11a884ca35 bugfix for machines so attack_hand's mob typechecks actually work right is usr is not user (most likely if usr isn't set) 2012-02-05 06:34:19 -05:00
Hawk-v3
34971bcd99 Should have fixed SUPERHEATED DOOM 2012-02-05 10:47:20 +00:00
Miniature
14a93a1454 Merge pull request #366 from Miniature/master 
Fix for votes being none mode
 2012-02-05 00:23:17 -08:00
Miniature
46d6cbdcd0 Fix for votes being none mode 2012-02-05 18:51:40 +10:30
SkyMarshal
b61120621b Merge pull request #364 from Tastyfish/master 
HOLY SHIT WERE THINGS BROKEN.
 2012-02-04 22:32:53 -08:00
SkyMarshal
c11502eb53 More fingerprint fixes 2012-02-04 23:12:53 -07:00
Tastyfish
35ae4bd5f3 turns out things broke from abi's runtime fix because that proc shouldn't ever be called here 2012-02-05 01:07:57 -05:00
SkyMarshal
6478bf03dc Merge pull request #361 from SkyMarshal/master 
No longer powers down the AI.
 2012-02-04 18:44:43 -08:00
SkyMarshal
dcd0197a1a Poor AI! 2012-02-04 19:43:00 -07:00
Tastyfish
1ba2ea16af Merge pull request #360 from SkyMarshal/master 
Some updates to cigarettes, throwing, and disposals.
 2012-02-04 17:28:25 -08: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
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