cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,677 Commits 2 Branches 1 Tag
3fb34237ee3158486d67ff1f76507419e92094de
Commit Graph

4915 Commits

Author SHA1 Message Date
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
Chinsky
712b952985 Merge pull request #8089 from GinjaNinja32/pai 
NanoUI pAI, more modular pAI software
 2015-02-10 10:05:20 +03:00
GinjaNinja32
503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00
GinjaNinja32
70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
GinjaNinja32
538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
Chinsky
30de86c081 Accessories update. 
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
 2015-02-08 12:35:50 +03:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit 
New bullet types, projectile refactor
 2015-02-07 14:07:22 -05:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans 
Update for the slimes
 2015-02-07 00:20:13 -05:00
mwerezak
0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
unknown
39b467c9da New bullet types, projectile rewrite 
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
 2015-02-06 20:09:32 -05:00
GinjaNinja32
0651bb8d84 Adds a cache to scramble() so that feeding the same input through multiple times in a short timespan results in the same output string. 
This means that you'll no longer get the radio message being entirely different from the non-radio message, and that all players will see the same scrambled string
 2015-02-06 23:26:09 +00:00
GinjaNinja32
c95399de91 Fixes "" from languages over radio. 2015-02-06 19:43:39 +00:00
Chinsky
3ddd0b480f Merge pull request #8061 from Baystation12/master 
master -> wiz
 2015-02-06 10:41:12 +03:00
Chinsky
3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle 
Expanded Escape/Transfer Shuttle
 2015-02-06 02:32:04 +03:00
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro 
Virology rework
 2015-02-06 00:18:13 +03:00
Chinsky
2100c51905 Merge pull request #8042 from PsiOmegaDelta/HearItSayIt 
Silicons now have some timestamped input
 2015-02-06 00:15:15 +03:00
Chinsky
abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName 
Silicons can now more easily be correctly renamed.
 2015-02-06 00:15:07 +03:00
Chinsky
fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano 
NanoUI/Topic make-over
 2015-02-06 00:15:04 +03:00
PsiOmega
a073cba477 Merge remote-tracking branch 'upstream/dev' into CanHasNano 
Conflicts:
	code/setup.dm
 2015-02-05 12:37:15 +01:00
Neerti
6567c68ecb Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle 2015-02-04 13:34:48 -05:00
Neerti
13d8bd47e7 Adds subtype of the AI core structure to disallow latejoining. 
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold.  This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
 2015-02-04 13:29:55 -05:00
SkyMarshal
d5c8a6262a Fixes the fix for supersonic walking. 2015-02-04 10:33:39 -07:00
Chinsky
8a46903231 Merge pull request #7830 from PsiOmegaDelta/CanTrack 
Camera tracking logic cleanup and tracking notice feature.
 2015-02-04 18:17:21 +03:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks 
Adds drying racks, tobacco, and updates pipes
 2015-02-04 18:15:13 +03:00
SkyMarshal
952fd3a373 Fixes supersonic walking with canes. 2015-02-04 05:30:56 -07:00
PsiOmega
f045f5b2e9 Timestamped speech for silicons. 2015-02-04 10:12:01 +01:00
PsiOmega
9352932e3d Timestamped radio for silicons 
All silicons now have timestamped radio messages.
 2015-02-04 10:04:18 +01:00
PsiOmega
1a1bf4a718 Silicons can now be easily renamed. 
Moves the AI SetName proc down silicon level.
 2015-02-04 09:48:30 +01:00
PsiOmega
0ec47b225f Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/setup.dm
 2015-02-04 00:00:17 +01:00
PsiOmega
566f6a104e Carded AIs can no longer access cameras through camera consoles. 
Also includes fixes for hidden uplinks.
 2015-02-03 23:44:35 +01:00
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
Kelenius
cb25b524ab Gives slimes a HUD and an ability to choose face 2015-02-04 01:39:30 +03:00
PsiOmega
a7a33e0a35 Merge remote-tracking branch 'upstream/dev' into GhostSight 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-02-03 22:28:53 +01:00
PsiOmega
ffa13c68cb Merge remote-tracking branch 'upstream/dev' into CanTrack 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 22:27:22 +01:00
Kelenius
c69bdd81a8 Working conflict fix 2015-02-03 23:38:35 +03:00
Kelenius
c9824f62df Conflict fix 2015-02-03 23:29:08 +03:00
PsiOmega
21a0aa05e5 Topic now uses the NanoUI can_interact_with_interface() proc to determine functionality. 
can_interact_with_interface() has been updated with the old canUseTopic() checks.
 2015-02-03 20:24:11 +01:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
GinjaNinja32
37f47fd3fa Merge remote-tracking branch 'upstream/dev' into viro 2015-02-03 16:28:10 +00:00
PsiOmegaDelta
021096d924 Merge pull request #7841 from comma/firefirEFIREBURNAHAHAHA 
Ported TG's code for burny mobs, by ergovisavi.
 2015-02-03 17:02:09 +01:00
Chinsky
71b19d5d8f Stupid typo & missing constants 2015-02-03 18:44:26 +03:00
GinjaNinja32
c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro 
Conflicts:
	code/modules/virus2/disease2.dm
 2015-02-03 15:33:37 +00:00
PsiOmegaDelta
24a7f5b5f0 Merge pull request #7938 from LethalGhost/dev 
More convenient give verb.
 2015-02-03 16:32:20 +01:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA 
Conflicts:
	code/modules/mob/living/living_defines.dm
 2015-02-03 18:30:18 +03:00
Chinsky
576f9c84a3 Merge pull request #8016 from PsiOmegaDelta/Impersonation 
Voice changer impersonation now works.
 2015-02-03 18:16:23 +03:00
Chinsky
889fee1b82 Merge pull request #7983 from PsiOmegaDelta/SynthStamp 
Timestamped AI radio messages.
 2015-02-03 18:14:44 +03:00
Chinsky
28ee1be312 Merge pull request #7952 from PsiOmegaDelta/AIEye 
Observers can now see the AI eye
 2015-02-03 18:14:08 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes 
refactor buckling + glowy HE pipes
 2015-02-03 18:12:09 +03:00
PsiOmegaDelta
dd52f970e2 Merge pull request #7856 from mwerezak/emote 
Adds ^ say shortcut for visible emotes
 2015-02-03 16:11:36 +01:00