cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 13:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 2 Branches 1 Tag
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

12971 Commits

Author SHA1 Message Date
SinTwo
a2b24d64b7 TG_Port_2 
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
 2015-10-11 00:36:13 -04:00
SinTwo
8eac3f8b9b TG Port 2015-10-11 00:33:44 -04:00
Mark9013100
3cc7a77846 The detective colt can now be reskinned 
Conflicts:
	code/modules/projectiles/guns/projectile/pistol.dm
 2015-10-11 00:30:06 -04:00
Datraen
7856ca948d [BOTANY] Seed Fixes 
Fixes seed storage, adds gas scanning properties to scanner
 2015-10-11 00:27:49 -04:00
Jon
de2ee16588 Fixes issues with incorrect loadout ids 2015-10-11 00:26:57 -04:00
Jon
9f2ec9c163 Adds three new hair flower pins - yellow, blue, and pink. 
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
 2015-10-11 00:26:54 -04:00
Neerti
2cc8dbbe18 Fixes savefile issue. 2015-10-11 00:24:48 -04:00
Neerti
bbe8c336b2 Adds socks. 
Conflicts:
	code/modules/client/preferences_savefile.dm
 2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
Hubblenaut
d3572bf4cb Fixes empty flavor text drawing two spaces 2015-10-10 15:55:25 +02:00
PsiOmegaDelta
13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
 2015-10-10 12:05:36 +02:00
PsiOmegaDelta
fd3370c01f Fixes #11263. 
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
 2015-10-10 10:11:48 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
HarpyEagle
fa86509daf Readds organ damage from failing to mend ribs 2015-10-09 18:57:17 -04:00
HarpyEagle
5684befee2 Fixes #11262 2015-10-09 18:57:17 -04:00
HarpyEagle
63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
PsiOmegaDelta
e237e33030 Merge pull request #11259 from mwerezak/rubber-bullets 
Rubber bullets and beanbags now check melee armour instead of bullet armour
 2015-10-09 12:42:44 +02:00
PsiOmegaDelta
4ca487e291 Merge pull request #10113 from mwerezak/wheredoesthepowercomefrom 
Makes newly fabricated power cells start uncharged
 2015-10-09 12:42:22 +02:00
GinjaNinja32
1f1857cc0a Merge pull request #11257 from Karolis2011/map_capture 
Added more help/error messages to the capture tool.
 2015-10-09 11:35:54 +01:00
HarpyEagle
40ab99b354 Rubber bullets and beanbags now check melee armour instead of bullet armour 2015-10-08 16:36:51 -04:00
HarpyEagle
38775120d7 Updates mechfab 
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
 2015-10-08 16:03:32 -04:00
mwerezak
83df0fa8f8 Makes powercells produced by the protolathe start uncharged. 2015-10-08 15:10:51 -04:00
Karolis2011
fad0e0b28a Added more help/error messages to the tool. 2015-10-08 12:36:09 +03:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo 
Updates blob
 2015-10-08 07:58:15 +02:00
Kelenius
82928d3b74 Fixes a minor blob issue, adds mecha attack message 2015-10-07 10:49:24 +03:00
PsiOmegaDelta
55c9f7533b Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name. 2015-10-07 08:56:13 +02:00
PsiOmegaDelta
aaba2c5c8c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
 2015-10-07 08:07:23 +02:00
Chinsky
8107786cbd Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech 
Makes silicon language handling more robust.
 2015-10-06 19:32:54 +03:00
PsiOmegaDelta
019c147bdc HUD element positioning. 
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).

Port of https://github.com/d3athrow/vgstation13/pull/5984.
 2015-10-06 12:51:03 +02:00
HarpyEagle
74950268d7 Fixes fire_stacks update logic 2015-10-05 19:24:33 -04:00
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-10-05 19:20:33 -04:00
Kelenius
83adba88d4 Updates blob 
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
 2015-10-05 18:10:16 +03:00
PsiOmegaDelta
bbcadcc080 Makes silicon language handling more robust. 
Also fixes an issue with lists being targets for qdel(). Fixes #11221.
 2015-10-05 11:21:09 +02:00
PsiOmegaDelta
f3175becc0 Overhauls humanoid vision handling. 
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
 2015-10-05 08:48:47 +02:00
PsiOmegaDelta
96a90bb5e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-10-04 17:41:02 +02:00
PsiOmegaDelta
f4be4c0ad9 Merge pull request #11238 from Baystation12/master 
Dev-freeze
 2015-10-04 17:31:44 +02:00
PsiOmegaDelta
a3a1f495a3 Implements my own comment suggestions and updates Travis' macro count. 2015-10-01 09:56:30 +02:00
PsiOmegaDelta
8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs 
Conflicts:
	baystation12.dme
 2015-10-01 09:48:51 +02:00
mwerezak
4dc7ff8e9c Merge pull request #11223 from GinjaNinja32/11222 
fix #11222
 2015-09-30 13:43:47 -04:00
GinjaNinja32
11141462a0 fix #11222 
also fixes the name and adds feedback to adding items
 2015-09-30 00:00:36 +01:00
PsiOmegaDelta
357c716a2b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-29 11:52:48 +02:00
PsiOmegaDelta
86223d65bf TODO done. 2015-09-29 11:28:31 +02:00
PsiOmegaDelta
597631687b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-29 11:26:42 +02:00
PsiOmegaDelta
d77bcd7937 The silicon law manager now only requires the host to be conscious. 
This should mean that the law manager is available even for carded AIs, even with the wireless interface disabled. Fixes #11139.
 2015-09-28 21:23:10 +02:00
GinjaNinja32
c8eb26326a Merge pull request #11208 from mwerezak/firemode-cleanup 
Fixes #10850
 2015-09-28 11:41:03 +01:00
GinjaNinja32
68ead3c410 Merge pull request #11206 from PsiOmegaDelta/150927-AdminCheckRuntime 
has_admin_rights() improvement.
 2015-09-27 22:37:53 +01:00
mwerezak
13c184c2a8 Fixes #10850 2015-09-27 14:13:37 -04:00
PsiOmega
e0951b1cf9 has_admin_rights() improvement. 
Now calls the check_rights() proc, which handles all checks for us.
 2015-09-27 17:05:15 +02:00