cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 15:42:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,877 Commits 2 Branches 1 Tag
fd007cdea0e38953a2ba9b9bc2bf903b51cf63db
Commit Graph

20230 Commits

Author SHA1 Message Date
PsiOmegaDelta
7b3759c1f3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt
 2015-07-12 14:49:31 +02:00
PsiOmegaDelta
2ed978b1e1 Wizards can no longer de-jaunt in turfs with dense objects. 
Also fixes an exploit where wizards could cast CentCom restricted spells by hiding inside objects, such as lockers or coffins.
 2015-07-12 14:31:26 +02:00
mwerezak
49e9248836 Fixes looking through cameras retaining the sight flags of worn glasses. 2015-07-11 23:27:18 -04:00
mwerezak
680a052136 Fixes check_eye() for AI, pAI, and helm console 
reset_view() is no longer called every time check_eye() is. Instead it
is called only when the mob's eye should change.
 2015-07-11 23:26:57 -04:00
Ccomp5950
325dfd9852 Merge pull request #10072 from NullSnapshot/adminfeatures 
[Fast-track] Moderator tempban changes.
 2015-07-11 23:21:49 -04:00
Zuhayr
7a4ed714d2 Merge pull request #10109 from GinjaNinja32/table 
Fixes tables not connecting
 2015-07-12 09:50:04 +09:30
GinjaNinja32
64da8265a9 Attempts to fix old character save files in a slightly nicer way. Should mean there's no difference with converted characters, but you never know. 2015-07-11 23:24:56 +01:00
GinjaNinja32
3b13199425 Fixes tables not connecting 2015-07-11 23:19:57 +01:00
PsiOmegaDelta
570c18881d Merge pull request #10108 from Zuhayr/dev-freeze 
Fixes #10062 and #10061
 2015-07-12 00:14:24 +02:00
Zuhayr
c59dc2445c Fixes #10062 and #10061 2015-07-12 07:04:35 +09:30
PsiOmegaDelta
796c6c7e42 Teleportation code now ignores dense objects with the ON_BORDER flag. 2015-07-11 17:30:40 +02:00
Null Snapshot
5b30703d30 Should be the last fixes needed. 2015-07-11 04:22:36 -07:00
PsiOmegaDelta
8457488755 Re-adds the Clamp defines. 2015-07-11 11:23:55 +02:00
PsiOmegaDelta
1287ad818a Ninjas can no longer teleport unto turfs that contain solid objects. 2015-07-11 11:12:08 +02:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
PsiOmegaDelta
339d08b20e Compilation fix. 2015-07-11 10:51:03 +02:00
PsiOmegaDelta
5575acccfd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-11 09:51:24 +02:00
Chinsky
9d2ffa3ffb Merge pull request #10087 from Loganbacca/turretfixes 
Fixes - turrets and cargo trains
 2015-07-11 08:33:04 +03:00
Loganbacca
7a82e1c563 Fixed turrets accidentally killing the AI 2015-07-11 13:31:28 +12:00
GinjaNinja32
c24f8f3452 Merge pull request #10088 from mwerezak/inhand-overlays2 
Ports grenade and flash in-hand sprites
 2015-07-10 21:12:11 +01:00
GinjaNinja32
9dbd06de0d Merge pull request #10099 from Loganbacca/conveyorfix 
Fixed dropping modules on conveyor belts
 2015-07-10 21:11:50 +01:00
Zuhayr
58c3da3970 Merge pull request #10093 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-07-11 03:43:59 +09:30
Loganbacca
09f502f8d7 Fixed spriteless item in xenoarch loot drop 2015-07-11 03:38:20 +12:00
Loganbacca
8848a51fe8 Fixed dropping modules on conveyor belts 2015-07-11 03:26:41 +12:00
mwerezak
fb1eeae640 Adds inhand sprites for grenades 
Adds inhand sprites for generic grenades, flashbang, and emp grenade.

Conflicts:
	code/game/objects/items/weapons/grenades/emgrenade.dm
 2015-07-10 11:00:29 -04:00
Loganbacca
c04fc312e2 Moved trajectory check to during target assessment 2015-07-11 02:47:47 +12:00
Loganbacca
ba7e3ae9e8 Cargo train vs projectiles 
If a cargo train has a mob riding it, there is a chance the mob will be hit by the projectile instead.
 2015-07-11 02:16:17 +12:00
Loganbacca
6b10b648d2 Implements turret trajectory prediction 
- Adds trajectory checking for turrets, so they don't burn holes through other objects (like walls and AI's) if they wouldn't hit them anyway.
 2015-07-11 02:16:17 +12:00
PsiOmegaDelta
a32b712bae Merge pull request #10097 from Loganbacca/laserfixes 
Projectile visual bug fixes
 2015-07-10 14:37:04 +02:00
Loganbacca
ce77c61028 Projectile visual bug fixes 
- Fixed visible beam projectile
- Fixed additional tracers overlaying impact effects
 2015-07-11 00:06:44 +12:00
PsiOmegaDelta
265802d270 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/_DynamicAreaLighting_TG.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/explosion.dm
 2015-07-10 12:57:46 +02:00
PsiOmegaDelta
6246d3bd9d Merge pull request #10079 from mwerezak/20150708-droplimb-fixes 
Droplimb fixes
 2015-07-10 11:38:00 +02:00
PsiOmegaDelta
e0ed7c3e69 Merge pull request #10089 from mwerezak/infection-fix 
Fixes a couple more virus oversights/bugs
 2015-07-10 11:37:50 +02:00
Iamgoofball
32a5582215 Fixes #10085 (probably) 
if this doesn't fix it then ????
 2015-07-10 02:32:35 -07:00
Null Snapshot
168f823c35 Fixed up the things pointed out by Ccomp5950. 2015-07-09 22:19:05 -07:00
mwerezak
d1b15fc601 Fixes a couple more virus oversights/bugs 
Fixes contact viruses spreading through windows, fixes bad copypasta in
infection_spreading_check()
 2015-07-10 01:02:16 -04:00
mwerezak
a36844cf84 Adds inhand sprites for the flash 2015-07-10 00:27:33 -04:00
HarpyEagle
3fd71881a3 Tweak/refactor external organ droplimb mechanics 2015-07-10 00:14:35 -04:00
mwerezak
8c4cc815ff Adds the ability to draw arrows with crayon 2015-07-09 23:35:06 -04:00
Zuhayr
fae8a6964e Merge pull request #10082 from mwerezak/inhand-icon-update 
Fixes #9976
 2015-07-10 13:02:16 +09:30
Zuhayr
eee306aedd Merge pull request #10083 from mwerezak/capgun-icon 
Fixes #9984
 2015-07-10 13:02:10 +09:30
mwerezak
6fb6237816 Fixes #9984 
Fixes capgun and dart crossbow inhands.
 2015-07-09 23:00:22 -04:00
mwerezak
bb0dea8991 Fixes #9976 
Deleted items update their loc's inhand overlays if they are in a mob
when GC'd.
 2015-07-09 22:55:51 -04:00
mwerezak
916c9972d9 Better num2hex 
More concise and readable, and faster too.
 2015-07-09 22:51:21 -04:00
mwerezak
cd2604e82d Fixes droplimb runtime 2015-07-09 22:25:18 -04:00
PsiOmegaDelta
6a8b051b21 Merge pull request #10076 from comma/dev-freeze 
Fixes #9680
 2015-07-09 23:41:42 +02:00
Null Snapshot
49ea79d0b3 Added missing return. 2015-07-09 14:40:30 -07:00
Chinsky
a21ce398ae Merge pull request #10074 from NullSnapshot/dev-freeze 
Fix for #8391
 2015-07-10 00:28:10 +03:00
Chinsky
d469b3f42d Fixes #9680 2015-07-10 00:27:16 +03:00
HarpyEagle
5011f9b806 Fixes virus infectionchance oversight 
Fixes oversight in minormutate() that would cause viruses to become
extremely infectious after spreading to another person.
 2015-07-09 17:26:15 -04:00