cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,362 Commits 2 Branches 1 Tag
36755f077c94bbdd4db12836ea8c901b39daae86
Commit Graph

11060 Commits

Author SHA1 Message Date
Mark9013100
a2c8e3ee10 Minor edits to the sec lockers 
Conflicts:
	maps/colony-1.dmm
 2015-10-11 00:45:22 -04:00
Mark9013100
1273a51f83 Merges f-card box and evidence bag box 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2015-10-11 00:41:46 -04:00
Datraen
d0bd6b8857 [BUG FIX] Wardrobe 
Socks are now able to be changed from the wardrobe
 2015-10-11 00:40:54 -04:00
Mark9013100
fb1134a24b Changes several helmets, fixes shields 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/modules/clothing/head/helmet.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-10-11 00:39:38 -04:00
SinTwo
4129b95f4e TG_PORT_fix 2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/suits/miscellaneous.dm
 2015-10-11 00:36:50 -04:00
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
Mark9013100
1eab12fc26 Two minor edits to ERT equipment 2015-10-11 00:30:10 -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
Mark9013100
2d709e7862 Flares now spawn in sec lockers 2015-10-11 00:28:47 -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
6740dea5ad Update Space Station 13 areas.dm 
Conflicts:
	code/game/area/Space Station 13 areas.dm
 2015-10-11 00:26:23 -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
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
6c3bbb9ee8 Updates changelog, fixes comment 2015-10-09 11:39:22 -04:00
HarpyEagle
63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
Hubblenaut
ba19c28c33 Adds laundry basket 2015-10-09 17:03:41 +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
ace1874f37 Merge pull request #11241 from Hubblenaut/light_replacer 
Amendments to light replacer
 2015-10-09 11:35:13 +01:00
HarpyEagle
fa661f998f TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
 2015-10-08 23:26:05 -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
PsiOmegaDelta
bd7c475fcc Stack material use now depends on charge costs. 
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
 2015-10-08 20:29:39 +02:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo 
Updates blob
 2015-10-08 07:58:15 +02: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
Hubblenaut
a7cad04264 Amendments to light replacer and janitor supply crate 2015-10-06 19:59:56 +02:00
Chinsky
f47a58e23e Merge pull request #11244 from Kelenius/hackMe 
Basic encryption hack popup only shows suitable APCs
 2015-10-06 20:29:51 +03:00
Chinsky
c7070dd7f7 Merge pull request #11251 from PsiOmegaDelta/151006-JobReport 
Antagonist summary printout now prefers assignment over special role.
 2015-10-06 19:26:42 +03:00
PsiOmegaDelta
ec097d928a Antagonist summary printout now prefers assignment over special role. 
As antags are listed under relevant headings, i.e. "The traitors were", this seems more reasonable. Fixes #10817.
 2015-10-06 09:19:40 +02: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
Zuhayr
e8196675e0 Merge pull request #11228 from Vivalas/dev 
Adds in AcmeCo brand explosive cigarettes.
 2015-10-06 00:42:43 +10:30
Kelenius
f3effa8df7 Basic encryption hack popup only shows suitable APCs 2015-10-05 11:40:19 +03:00
PsiOmegaDelta
91faf8555f Antag placement now favors mobless turfs. 
If one such turf is available, otherwise picks a random populated turf. Fixes #11237.
 2015-10-05 10:13:05 +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
Hubblenaut
8f7d108831 Ctrl+Click deflates inflatables 2015-10-04 15:56:45 +02:00
Vivalas
0bf5145e24 Name change 2015-10-01 13:35:26 -05: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
Vivalas
d2c355a937 Adds in KillerKickthroats 2015-09-30 17:56:35 -05:00
Vivalas
8b6650d217 Briefcase Fix 2015-09-30 17:10:57 -05:00
Daranz
b881d4055f Make cloners go 'DING!' when ejecting clones 2015-09-27 13:55:37 -04:00
Zuhayr
d1d28b3da5 Merge pull request #11201 from PsiOmegaDelta/150927-TurfInit 
Turf initialization tweaking.
 2015-09-27 22:19:08 +09:30
PsiOmega
63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
PsiOmega
fa6319d52d Turf initialization tweaking. 
Removes the need for a spawn() in New().
 2015-09-27 13:18:18 +02:00