cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 15:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 2 Branches 1 Tag
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

1679 Commits

Author SHA1 Message Date
PsiOmega
57c0591283 Fixes ninja spawn logic. 
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
 2015-03-09 19:22:07 +01:00
Chinsky
36233b72e2 Merge pull request #8367 from mwerezak/cult-conversion 
Improves cult conversion
 2015-03-06 11:57:03 +03:00
mwerezak
32ee4d57dd Improves cult conversion 
Now uses a continuous damage system, dealing damage once every 100 ticks (~10 seconds).
Also improves effects dealt when resisting conversion.
 2015-03-05 23:58:56 -05:00
PsiOmega
7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm
 2015-02-27 09:06:48 +01:00
mwerezak
ec59f8ab07 Fixes captain's laser gun 
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
 2015-02-25 23:35:20 -05:00
mwerezak
944be58804 Adjusts sniper rifle damage 
Lowers wall pierce chance back to original value to compensate, and
increase the cost of ammo by 1 TC.
 2015-02-24 20:45:40 -05:00
PsiOmega
afb7f7eff7 Fixes #8223. 
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
 2015-02-24 12:27:03 +01:00
PsiOmega
1fd70d03b1 Fixes Malfuction Turret Upgrade 
Now upgrades all portable turrets on the station, instead of turrets found in the player list.
Decreases delays between shots, instead of increasing it, to 66% of original delay.
 2015-02-24 08:28:15 +01:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
PsiOmega
c55f807b42 Removes random Telecrystal grants, instead increases the start amount by 2. 2015-02-23 20:56:48 +01:00
PsiOmega
b38d8495b3 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather 
Conflicts:
	code/game/gamemodes/game_mode.dm
	code/modules/clothing/spacesuits/rig/suits/merc.dm
 2015-02-23 17:38:50 +01:00
PsiOmega
5be726753f Updates paths after the projectile update. Adds rig modules to the uplink. 2015-02-23 17:33:12 +01:00
mwerezak
115bbbe669 Nerfs merc sniper rifle and makes it uplink purchasable 
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
 2015-02-22 20:27:06 -05:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
PsiOmega
0b9406a089 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather 2015-02-21 10:17:17 +01:00
Chinsky
214324eaaf Merge pull request #8156 from PsiOmegaDelta/CameraMove 
Custom ninja spawn points.
 2015-02-21 11:43:19 +03:00
PsiOmega
18521e6983 Now possible to order a kit with a random toxin and syringe - 4TC 2015-02-20 21:13:34 +01:00
PsiOmega
958391d06b Custom ninja spawn points. 
The ninja should no longer risk spawning far away from the station, with no clue where to go to reach it.
 2015-02-18 08:14:40 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm 
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
 2015-02-14 13:38:05 -05:00
PsiOmega
4c20beac43 Adds a surgical kit for 3TC. Contains only tools, no medication. 2015-02-14 11:47:49 +01:00
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega
3fb34237ee Additional uplink items. 
Adds the syndicate radio channel encryption key for 2TC.
Adds a trash bag to the Smooth operator (9mm+silencer) kit.
 2015-02-13 13:22:12 +01:00
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
 2015-02-13 01:57:19 -05:00
Chinsky
9dd282e43b Merge pull request #8105 from PsiOmegaDelta/SyndicateDedLongLiveSyndicate 
New traitor items
 2015-02-13 08:22:28 +03:00
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter. 
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
 2015-02-12 16:35:49 +01:00
Zuhayr
c953e279a4 Update from dev. 2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
PsiOmega
cb82dd950e Adds a floppy disk which provides access to the station camera network given appropriate hardware. 2015-02-12 12:20:58 +01:00
mwerezak
5740f52964 Merge branch 'guns' into gun-rewrite 
Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
 2015-02-11 18:08:43 -05:00
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite 
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
 2015-02-10 20:59:22 -05:00
PsiOmega
3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
PsiOmega
dcb2e22e61 Adds a concealed cane sword for 2 TC. 2015-02-10 22:37:25 +01:00
PsiOmega
d0a59bcd03 Adds a health section in the uplink. 
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
 2015-02-10 21:29:29 +01:00
PsiOmega
02dc9e3008 Lightly boosts the clerical kit. 
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
 2015-02-10 20:12:32 +01:00
PsiOmega
8ceaa8b5a1 Traitors can now order a spy kit 
Traitors can now order a spy kit containing 3 camera+radio bugs + a monitor for 2 telecrystals.
 2015-02-10 19:33:02 +01:00
PsiOmega
86c4e28326 Sorts uplink items by cost, then name. 2015-02-10 12:21:06 +01:00
PsiOmega
005f8ef405 Adds passive aggressive NanoTrasen balloon. 2015-02-10 12:17:25 +01:00
mwerezak
fc6dfb5f1b Ammo magazine and casing update 
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
 2015-02-09 21:32:49 -05:00
SkyMarshal
dadea3c7fa Adds two admin weapons and refactors wall damage code. 
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
 2015-02-08 04:01:35 -07:00
GinjaNinja32
251e162a2c Fixes changeling sting A* call, adds messages to let the changeling know what went wrong if it did 2015-02-06 09:52:01 +00:00
Zuhayr
09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
Zulker Nayeen Nahiyan
0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
 2015-02-04 04:44:09 +06:00
volas
8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
Chinsky
b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass 
Removes FPRINT and TABLEPASS flags
 2015-01-30 16:17:41 +03:00
Loganbacca
fbabdce615 Finished renaming nuclear mode to mercenary 
Mostly cleans up the admin side of things.
 2015-01-27 13:42:27 +13:00
Loganbacca
47157a20be Fixed mercenary game mode announcement 2015-01-26 17:57:34 +13:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00