cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,973 Commits 2 Branches 1 Tag
597631687b828a35037da3a0c07bf96cf6af8fa1
Commit Graph

20294 Commits

Author SHA1 Message Date
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
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
Chinsky
c3d6fd07fd Merge pull request #11199 from mwerezak/paper-gender 
Fixes #11196
 2015-09-27 13:02:59 +03:00
Chinsky
7ad55e0197 Merge pull request #11200 from mwerezak/sojourner 
Fixes #11130
 2015-09-27 13:02:50 +03:00
HarpyEagle
380b89fcc0 Fixes #11130, renames aghosted var 
because it is no longer used solely for aghosting.
 2015-09-26 20:48:13 -05:00
HarpyEagle
592c824837 Changes paper and paper bundle gender, plus rename 2015-09-26 20:27:57 -05:00
Hubblenaut
f0481b551e Fixes grab-buckling overwriting pixelshift 2015-09-26 14:11:01 +02:00
PsiOmega
145d8d91ef Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/_helpers/unsorted.dm
 2015-09-26 08:43:06 +02:00
GinjaNinja32
c987fedc24 Merge pull request #11180 from BlueNexus/patch-1 
Gave Asset Protection their proper rig
 2015-09-25 14:09:28 +01:00
Chinsky
0ce1495a12 Merge pull request #11178 from GinjaNinja32/lawzero 
fix traitor AIs not getting a law zero
 2015-09-25 11:46:40 +03:00
PsiOmegaDelta
509486dbd9 Merge pull request #11181 from GinjaNinja32/crash_with 
Add proc/crash_with, fix two incorrect qdel calls
 2015-09-25 06:31:38 +02:00
PsiOmegaDelta
61a4d3b7af Merge pull request #11185 from Baystation12/master 
Dev-freeze
 2015-09-24 08:17:45 +02:00
BlueNexus
76f06e6e9b Gave Asset Protection their proper rig 
Fairly self explanatory.
 2015-09-23 13:29:54 +01:00
GinjaNinja32
8ed4faf7b2 Add proc/crash_with, fix two incorrect qdel calls 2015-09-23 13:29:54 +01:00
GinjaNinja32
9be47c6374 Permabans do not expire, and we don't need to show expired when it's been manually lifted 2015-09-23 13:03:11 +01:00
GinjaNinja32
c707519d1f Add specific color for expired bans in ban panel, fix some formatting and a runtime 2015-09-23 12:58:39 +01:00
GinjaNinja32
280c932add fix traitor AIs not getting a law zero 2015-09-23 12:26:53 +01:00
PsiOmega
5b4c7340e4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-21 17:26:19 +02:00
Daranz
ebaa452c4c Fix spelling: 'its' in place of 'it's' 2015-09-21 15:37:22 +02:00
PsiOmegaDelta
de9e68cdcd Merge pull request #11151 from Baystation12/master 
Dev-freeze
 2015-09-19 21:25:15 +02:00
Hubblenaut
4eef7ab65d Fixes beds occasionally buckling in odd directions 2015-09-19 15:27:24 +02:00
PsiOmegaDelta
2d01a06f00 Corrects world-edge math. 
Meteors coming from the east would immediately be transfered to another Z-level and deleted, due to being considered outside the Z-level transition border.
 2015-09-18 15:23:18 +02:00
GinjaNinja32
780db3314d Merge pull request #11128 from PsiOmegaDelta/150917-BumpyRide 
Fixes Pun-Pun (and other small mobs) pushing people around.
 2015-09-18 08:20:35 +01:00
PsiOmegaDelta
9946c837e4 Merge pull request #11134 from Baystation12/master 
Dev-freeze
 2015-09-18 08:50:11 +02:00
Chinsky
7a2183e97e Merge pull request #11107 from Kelenius/reishiJitter 
Fixes  #10925
 2015-09-18 06:08:44 +03:00
PsiOmegaDelta
f65649c8ba Fixes Pun-Pun (and other monkeys) pushing people around. 
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
 2015-09-17 09:40:19 +02:00
Chinsky
412380c3ab Merge pull request #11110 from GinjaNinja32/cleaning 
fix #11061
 2015-09-17 05:43:11 +03:00
Chinsky
5d1b1cd123 Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice 
Prevents observer mice from spawning on the admin Z-level.
 2015-09-17 05:42:15 +03:00
GinjaNinja32
73078a19ce Merge pull request #11091 from mwerezak/lighting-fix 
Fixes #10710
 2015-09-16 14:59:39 +01:00
GinjaNinja32
24ba93c3fa Merge pull request #11108 from FalseIncarnate/master 
Invisible / Missing Growth State Fix
 2015-09-16 09:48:32 +01:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
GinjaNinja32
6a61269edd Merge pull request #11106 from Kelenius/jetpackFixes 
Fixes for jetpacks and gas tanks
 2015-09-15 15:06:58 +01:00
GinjaNinja32
52b51a6be4 fix #11061 2015-09-15 13:24:11 +01:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
FalseIncarnate
4a9dc8dc8f Invisible / Missing Growth State Fix 
Fixes a number of plants seemingly randomly having invisible plant
growth states.
- This was caused by overly-rounded math resulting in attempts to call
growth states that do not exist.
 2015-09-14 17:35:33 -04:00
mwerezak
db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair 
Converts some loc = to forceMove()
 2015-09-14 12:11:09 -04:00
Kelenius
eef1013db2 Fixes #10925 
Makes psilocybin less robust, also cuts down emote spam
 2015-09-14 16:54:24 +03:00
Kelenius
3c4369823f Fixes for jetpacks 
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
 2015-09-14 16:35:52 +03:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove() 
Fixes #11102.
 2015-09-14 11:13:15 +02:00
Kelenius
9dd6f9762a Resolves #11049 2015-09-14 12:05:28 +03:00
PsiOmegaDelta
b79f061877 Merge pull request #11103 from GinjaNinja32/pills 
fix pill attack_log entry, switch to using key_name
 2015-09-14 07:31:07 +02:00
GinjaNinja32
e29f5d108c fix pill attack_log entry, switch to using key_name 2015-09-14 06:24:49 +01:00
PsiOmega
a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
 2015-09-13 10:44:06 +02:00
mwerezak
26d0a35699 Merge pull request #11085 from PsiOmegaDelta/150912-ForceMarch 
Fixes #10988.
 2015-09-12 23:29:03 -04:00
GinjaNinja32
5721e55f72 Merge pull request #11078 from PsiOmegaDelta/150912-StateYourLaws 
Ensures the AI should always be able to state ion laws.
 2015-09-13 02:23:27 +01:00
mwerezak
810ca147d0 Fixes #10710 2015-09-12 19:34:43 -04:00
PsiOmega
0c21ef741e Fixes #10988. 
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926.
 2015-09-12 20:43:24 +02:00
PsiOmega
81861f4dd6 Ensures the AI should always be able to state ion laws. 
Switched the first character selection to a number to avoid collision with custom language keys on dev.
 2015-09-12 15:02:42 +02:00